Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -120,7 +120,7 @@ public:
|
||||
else
|
||||
{
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
private:
|
||||
@@ -332,10 +332,10 @@ public:
|
||||
#define PIXSetMarkerDeprecated(a, b, ...) PIXSetMarker(a, L ## b, __VA_ARGS__)
|
||||
#define PIXAddNamedCounter(a, b) PIXReportCounter( L ## b, a)
|
||||
#else
|
||||
void PIXAddNamedCounter(int a, const char *b, ...);
|
||||
void PIXBeginNamedEvent(int a, const char *b, ...);
|
||||
void PIXEndNamedEvent();
|
||||
void PIXSetMarkerDeprecated(int a, const char *b, ...);
|
||||
inline void PIXAddNamedCounter(int, const char*, ...) {}
|
||||
inline void PIXBeginNamedEvent(int, const char*, ...) {}
|
||||
inline void PIXEndNamedEvent() {}
|
||||
inline void PIXSetMarkerDeprecated(int, const char*, ...) {}
|
||||
#endif
|
||||
|
||||
void XSetThreadProcessor(HANDLE a, int b);
|
||||
|
||||
Reference in New Issue
Block a user