[Orxonox-commit 2411] r7126 - code/branches/presentation3/src/libraries/util

rgrieder at orxonox.net rgrieder at orxonox.net
Wed Jun 9 21:16:43 CEST 2010


Author: rgrieder
Date: 2010-06-09 21:16:43 +0200 (Wed, 09 Jun 2010)
New Revision: 7126

Modified:
   code/branches/presentation3/src/libraries/util/Singleton.h
Log:
Using <cstring> to define NULL: I have done so in different places.

Modified: code/branches/presentation3/src/libraries/util/Singleton.h
===================================================================
--- code/branches/presentation3/src/libraries/util/Singleton.h	2010-06-09 15:34:23 UTC (rev 7125)
+++ code/branches/presentation3/src/libraries/util/Singleton.h	2010-06-09 19:16:43 UTC (rev 7126)
@@ -30,12 +30,10 @@
 #define __Util_Singleton_H__
 
 #include "UtilPrereqs.h"
+
 #include <cassert>
+#include <cstring>
 
-#ifndef NULL
-#  define NULL 0
-#endif
-
 namespace orxonox
 {
     /**




More information about the Orxonox-commit mailing list