pragma once to a few more header files.

OpenXRay · Aug 5, 2017 · 7a92351 · 7a92351
1 parent 8ffff01
commit 7a92351
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/xrCore/vector.h b/src/xrCore/vector.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef _vector_included
 #define _vector_included
 

diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -1,6 +1,7 @@
+#pragma once
 #ifndef xrCoreH
 #define xrCoreH
-#pragma once
+
 // XXX: upgrade std hash structures
 #define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 #ifndef DEBUG
@@ -53,7 +54,9 @@
 #define DEBUG
 #endif
 #ifdef MIXED
-#define DEBUG
+# ifndef DEBUG
+#  define DEBUG
+# endif
 #endif
 
 #ifndef DEBUG

diff --git a/src/xrCore/xrCore_impexp.h b/src/xrCore/xrCore_impexp.h
@@ -1,6 +1,4 @@
-#ifdef _MSC_VER
 #pragma once
-#endif
 #ifndef XRCORE_IMPEXP_H
 #define XRCORE_IMPEXP_H
 #include "Common/xr_impexp_macros.h"

diff --git a/src/xrCore/xrDebug_macros.h b/src/xrCore/xrDebug_macros.h
@@ -1,6 +1,6 @@
+#pragma once
 #ifndef xrDebug_macrosH
 #define xrDebug_macrosH
-#pragma once
 
 #define DEBUG_INFO {__FILE__, __LINE__, __FUNCTION__}
 #define CHECK_OR_EXIT(expr, message)\