[Orxonox-commit 2856] r7559 - code/branches/ois_update/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-19 23:16:01 +0200 (Tue, 19 Oct 2010)
New Revision: 7559

Modified:
   code/branches/ois_update/src/libraries/core/Super.h
Log:
Reverted changes made for testing purposes.

Modified: code/branches/ois_update/src/libraries/core/Super.h
===================================================================
--- code/branches/ois_update/src/libraries/core/Super.h	2010-10-19 21:06:16 UTC (rev 7558)
+++ code/branches/ois_update/src/libraries/core/Super.h	2010-10-19 21:16:01 UTC (rev 7559)
@@ -68,39 +68,14 @@
        Location: The header-file of the baseclass (Baseclass.h), below the class declaration
 */
 
-#ifndef _SuperDuper_H__
-#define _SuperDuper_H__
+#ifndef _Super_H__
+#define _Super_H__
 
 #include "CorePrereqs.h"
 
 #include "util/Debug.h"
 #include "Event.h"
 
-#ifdef SUPER
-struct CompilerError1
-{
-    void CompilerError1() {}
-};
-#endif
-#ifdef SUPER_FUNCTION
-struct CompilerError2
-{
-    void CompilerError2() {}
-};
-#endif
-#ifdef SUPER_NOARGS
-struct CompilerError3
-{
-    void CompilerError3() {}
-};
-#endif
-#ifdef SUPER_ARGS
-struct CompilerError4
-{
-    void CompilerError4() {}
-};
-#endif
-
 ///////////////////////
 // Macro definitions //
 ///////////////////////
@@ -580,7 +555,7 @@
 
 }
 
-#else /* _SuperDuper_H__ */
+#else /* _Super_H__ */
   #ifdef SUPER_INTRUSIVE_DECLARATION_INCLUDE
 
 //////////////////////////////////////////////////////////////////////////
@@ -638,4 +613,4 @@
 
     #undef SUPER_INTRUSIVE_DECLARATION_INCLUDE
   #endif /* SUPER_INTRUSIVE_DECLARATION_INCLUDE */
-#endif /* _SuperDuper_H__ */
+#endif /* _Super_H__ */