Browse Source

Fixes issue 44 - allows Linux build with compiler flag -std=c++17

nahkhiir 2 years ago
parent
commit
f0de4c7c5f

+ 1 - 1
engine/source/2d/assets/ParticleAssetFieldCollection.h

@@ -27,7 +27,7 @@
 #include "2d/assets/ParticleAssetField.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/2d/core/BatchRender.h

@@ -39,7 +39,7 @@
 #include "graphics/TextureManager.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/2d/scene/Scene.h

@@ -51,7 +51,7 @@
 #include "2d/scene/DebugDraw.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/2d/sceneobject/Trigger.h

@@ -27,7 +27,7 @@
 #include "2d/sceneobject/SceneObject.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/assets/assetTagsManifest.h

@@ -27,7 +27,7 @@
 #include "sim/simBase.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 3 - 3
engine/source/collection/hashTable.h

@@ -20,8 +20,8 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#ifndef _HASHTABLE_H
-#define _HASHTABLE_H
+#ifndef _HASHTABLE_H_
+#define _HASHTABLE_H_
 
 #include "vector.h"
 #include "platform/platform.h"
@@ -697,4 +697,4 @@ inline Value& HashMap<Key,Value,Sequence>::operator[](const Key& key)
 
 
 
-#endif// _HASHTABLE_H
+#endif// _HASHTABLE_H_

+ 1 - 1
engine/source/collection/nameTags.h

@@ -27,7 +27,7 @@
 #include "sim/simBase.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/component/behaviors/behaviorInstance.h

@@ -26,7 +26,7 @@
 #include "sim/simBase.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/console/console.cc

@@ -42,7 +42,7 @@
 #include "output_ScriptBinding.h"
 #include "expando_ScriptBinding.h"
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/graphics/gColor.cc

@@ -30,7 +30,7 @@
 #include "string/stringUnit.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/gui/guiTypes.h

@@ -61,7 +61,7 @@
 
 #include "graphics/gFont.h"
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 1 - 1
engine/source/module/moduleManager.h

@@ -31,7 +31,7 @@
 #include "collection/vector.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 2 - 2
engine/source/persistence/taml/binary/tamlBinaryReader.h

@@ -23,7 +23,7 @@
 #ifndef _TAML_BINARYREADER_H_
 #define _TAML_BINARYREADER_H_
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 
@@ -33,7 +33,7 @@
 
 //-----------------------------------------------------------------------------
 
-/// @ingroup tamlGroup
+/// @ingroup tamlGroup
 /// @see tamlGroup
 class TamlBinaryReader
 {

+ 2 - 2
engine/source/persistence/taml/json/tamlJSONReader.h

@@ -23,7 +23,7 @@
 #ifndef _TAML_JSONREADER_H_
 #define _TAML_JSONREADER_H_
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 
@@ -37,7 +37,7 @@
 
 //-----------------------------------------------------------------------------
 
-/// @ingroup tamlGroup
+/// @ingroup tamlGroup
 /// @see tamlGroup
 class TamlJSONReader
 {

+ 1 - 1
engine/source/persistence/taml/taml.h

@@ -47,7 +47,7 @@
 #include "sim/simBase.h"
 #endif
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 

+ 2 - 2
engine/source/persistence/taml/xml/tamlXmlReader.h

@@ -23,7 +23,7 @@
 #ifndef _TAML_XMLREADER_H_
 #define _TAML_XMLREADER_H_
 
-#ifndef _HASHTABLE_H
+#ifndef _HASHTABLE_H_
 #include "collection/hashTable.h"
 #endif
 
@@ -37,7 +37,7 @@
 
 //-----------------------------------------------------------------------------
 
-/// @ingroup tamlGroup
+/// @ingroup tamlGroup
 /// @see tamlGroup
 class TamlXmlReader
 {