Skip to content

Commit 09154e0

Browse files
committed
fix: add CppMacros.h include to files using nullptr
fix: add CppMacros.h includes for VC6 nullptr compatibility fix: add core_utility link for Babylon tool to access CppMacros.h fix: add core_utility link for buildVersionUpdate tool to access CppMacros.h fix: add core_utility link for Tools that include CppMacros.h fix: Add core_utility to DebugWindow target to resolve CppMacros.h include fix: add CppMacros.h include for nullptr support in dialog.cpp fix: add CppMacros.h include to BFISH.cpp for nullptr support
1 parent 2058acf commit 09154e0

File tree

627 files changed

+659
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

627 files changed

+659
-0
lines changed

Core/GameEngine/Include/Common/GameMemoryNull.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919
#pragma once
20+
#include <Utility/CppMacros.h>
2021

2122
#define allocateBytes(ARGCOUNT,ARGLITERAL) allocateBytesImplementation(ARGCOUNT)
2223
#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL) allocateBytesDoNotZeroImplementation(ARGCOUNT)

Core/GameEngine/Include/GameNetwork/LANPlayer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
// Author: Matthew D. Campbell, October 2001 (Pulled out of LANAPI.h by CLH on 12/21/01
2828

2929
#pragma once
30+
#include <Utility/CppMacros.h>
3031

3132
/**
3233
* LAN player class. This is for players sitting in the lobby. Players are

Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
//
2929

3030
#pragma once
31+
#include <Utility/CppMacros.h>
3132

3233
#include <atlbase.h>
3334
extern CComModule _Module;

Core/GameEngine/Source/Common/Audio/simpleplayer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919

20+
#include <Utility/CppMacros.h>
2021
#include "Common/simpleplayer.h"
2122
#include "Common/urllaunch.h"
2223

Core/GameEngine/Source/Common/Audio/urllaunch.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919

20+
#include <Utility/CppMacros.h>
2021
#include "Common/urllaunch.h"
2122

2223
#define FILE_PREFIX L"file://"

Core/GameEngine/Source/Common/System/GameMemoryNull.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
** along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19+
#include <Utility/CppMacros.h>
1920
#include "PreRTS.h"
2021

2122
#include <malloc.h>

Core/GameEngine/Source/Common/System/MiniDumper.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
** along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19+
#include <Utility/CppMacros.h>
1920
#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine
2021

2122
#ifdef RTS_ENABLE_CRASHDUMP

Core/GameEngine/Source/Common/WorkerProcess.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
** along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19+
#include <Utility/CppMacros.h>
1920
#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine
2021
#include "Common/WorkerProcess.h"
2122

Core/Libraries/Source/Compression/EAC/huffencode.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#ifndef __HUFWRITE
2222
#define __HUFWRITE 1
2323

24+
#include <Utility/CppMacros.h>
25+
2426
#include <string.h>
2527
#include "codex.h"
2628
#include "huffcodex.h"

Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
6363

6464

65+
#include <Utility/CppMacros.h>
6566
#include "aabtree.h"
6667
#include "aabtreebuilder.h"
6768
#include "wwdebug.h"

0 commit comments

Comments
 (0)