Changeset 9361 in orxonox.OLD

Timestamp:

Jul 20, 2006, 3:54:38 PM (18 years ago)

Author:

bensch

Message:

more and better adaptions

Location:

branches/proxy/src/lib

Files:

• lang/base_object.h (modified) (2 diffs)
• util/sigslot/signal.h (modified) (2 diffs)
• util/sigslot/slot.h (modified) (3 diffs)

branches/proxy/src/lib/lang/base_object.h

@@ -17 +17 @@
 #include <string>
 
+#include "sigslot/slot.h"
+
 class TiXmlNode;
 class TiXmlElement;
@@ -22 +24 @@
 
 //! A class all other classes are derived from
-class BaseObject
+class BaseObject : public sigslot::has_slots<>
 {
 

branches/proxy/src/lib/util/sigslot/signal.h

@@ +1 @@
+/**
+ * @file signal.h
+ * @adaption from the beautiful sigslot implementation of sarah Thompson
+ */
+
 // sigslot.h: Signal/Slot classes
 //
@@ -82 +87 @@
 #include <list>
 
-#if defined(SIGSLOT_PURE_ISO) || (!defined(WIN32) && !defined(__GNUG__) && !defined(SIGSLOT_USE_POSIX_THREADS))
-#       define _SIGSLOT_SINGLE_THREADED
-#elif defined(WIN32)
-#       define _SIGSLOT_HAS_WIN32_THREADS
-#       include <windows.h>
-#elif defined(__GNUG__) || defined(SIGSLOT_USE_POSIX_THREADS)
-#       define _SIGSLOT_HAS_POSIX_THREADS
-#       include <pthread.h>
-#else
-#       define _SIGSLOT_SINGLE_THREADED
-#endif
-
-#ifndef SIGSLOT_DEFAULT_MT_POLICY
-#       ifdef _SIGSLOT_SINGLE_THREADED
-#               define SIGSLOT_DEFAULT_MT_POLICY single_threaded
-#       else
-#               define SIGSLOT_DEFAULT_MT_POLICY multi_threaded_local
-#       endif
-#endif
-
 #include "slot.h"
 

branches/proxy/src/lib/util/sigslot/slot.h

@@ -1 @@
-
-
-
-
+/**
+ * @file slot.h
+ * @brief Slots part of Signal Slot library from Sarah Thopson
+ */
+
+#ifndef SLOT_H__
+#define SLOT_H__
 
 #include <set>
@@ -28 +31 @@
 #endif
 
-
-
-
 namespace sigslot
 {
@@ -303 +303 @@
   };
 }
+
+#endif /* SLOT_H__ */