Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/DivideSever/main.cpp

Diff revisions: vs.
  @@ -6,18 +6,33 @@
6 6
7 7 using namespace Divide;
8 8
9 - void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned int debugFlags, const char* file, int line)
9 + void* operator new[](size_t size,
10 + size_t alignment,
11 + size_t alignmentOffset,
12 + const char* pName,
13 + int flags,
14 + unsigned int debugFlags,
15 + const char* file,
16 + int line)
10 17 {
11 18 // this allocator doesn't support alignment
12 19 EASTL_ASSERT(alignment <= 8);
13 20 return malloc(size);
14 21 }
15 - void* operator new[](size_t size, const char* pName, int flags, unsigned int debugFlags, const char* file, int line)
22 + void* operator new[](size_t size,
23 + const char* pName,
24 + int flags,
25 + unsigned int debugFlags,
26 + const char* file,
27 + int line)
16 28 {
17 29 return malloc(size);
18 30 }
19 31 // E
20 - int Vsnprintf8(char* pDestination, size_t n, const char* pFormat, va_list arguments)
32 + int Vsnprintf8(char* pDestination,
33 + size_t n,
34 + const char* pFormat,
35 + va_list arguments)
21 36 {
22 37 #ifdef _MSC_VER
23 38 return _vsnprintf(pDestination, n, pFormat, arguments);