Changeset 676

Timestamp:

Dec 23, 2007, 3:36:30 AM (16 years ago)

Author:

landauf

Message:

• include guards
• readded Light (maybe i'll remove it again, but at the moment i want it to stay)

Location:

code/branches/FICN/src

Files:

• misc/String2Number.h (modified) (2 diffs)
• misc/Tokenizer.h (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/core/CoreIncludes.h (modified) (2 diffs)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/Light.cc (added)
• orxonox/objects/Light.h (added)

code/branches/FICN/src/misc/String2Number.h

@@ -1 @@
-#ifndef __STRING2NUMBER_H__
-#define __STRING2NUMBER_H__
+#ifndef _String2Number_H__
+#define _String2Number_H__
 
 #include <string>
@@ -127 +127 @@
 }
 
-#endif
+#endif /* _String2Number_H__ */

code/branches/FICN/src/misc/Tokenizer.h

@@ -1 @@
-#ifndef __TOKEINZER_H__
-#define __TOKEINZER_H__
+#ifndef _Tokenizer_H__
+#define _Tokenizer_H__
 
 #include <string>
@@ -37 +37 @@
 
 
-#endif
+#endif /* _Tokenizer_H__ */

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -29 +29 @@
     objects/Model.cc
     objects/Mesh.cc
+    objects/Light.cc
     objects/SpaceShip.cc
     objects/NPC.cc

code/branches/FICN/src/orxonox/core/CoreIncludes.h

@@ -25 +25 @@
  *
  */
+
+#ifndef _CoreIncludes_H__
+#define _CoreIncludes_H__
 
 /**
@@ -137 +140 @@
     } \
     varname = container##varname->getValue(varname)
+
+#endif /* _CoreIncludes_H__ */

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -9 +9 @@
   Fighter.cc
   Mesh.cc
+  Light.cc
   Model.cc
   NPC.cc