Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 167 vs 168 for /trunk/Source Code/core.h

Diff revisions: vs.
  @@ -26,7 +26,7 @@
26 26 #ifdef HIDE_DEBUG_CONSOLE
27 27 #pragma comment( linker,"/subsystem:\"windows\" /entry:\"mainCRTStartup\"" )
28 28 #endif
29 -
29 + /*
30 30 #define NEW_PARAM (__FILE__, __LINE__)
31 31 #define PLACEMENTNEW_PARAM ,__FILE__, __LINE__
32 32 #define NEW_DECL , char* zFile, int nLine
  @@ -35,8 +35,8 @@
35 35 void operator delete(void * pxData ,char* zFile, int nLine);
36 36 void * malloc_simd(const size_t bytes);
37 37 void free_simd(void * pxData);
38 -
39 - #define New new NEW_PARAM
38 + */
39 + #define New new //NEW_PARAM
40 40
41 41 #ifndef NOMINMAX
42 42 #define NOMINMAX
  @@ -47,7 +47,7 @@
47 47 #include <stdio.h>
48 48 #include <iostream>
49 49 #include <assert.h>
50 - #include <memory.h>
50 + #include <memory>
51 51 #include <malloc.h>
52 52 #include <typeinfo.h>
53 53 #include <time.h>
  @@ -64,8 +64,13 @@
64 64
65 65 #define PNew(macroparam) new (macroparam PLACEMENTNEW_PARAM)
66 66
67 - #define GETTIME() getMsToSec(Framerate::getInstance().getElapsedTime())
68 - #define GETMSTIME() Framerate::getInstance().getElapsedTime()
67 + inline U32 GETTIME() {
68 + return getMsToSec(Framerate::getInstance().getElapsedTime());
69 + }
70 +
71 + inline U32 GETMSTIME() {
72 + return Framerate::getInstance().getElapsedTime();
73 + }
69 74
70 75 template <class T>
71 76 inline T squared(T n){