Changeset 33892 for lang/objective-cplusplus

Timestamp:

06/11/09 02:42:19 (4 years ago)

Author:

saturday06

Message:

adfadf

Location:

lang/objective-cplusplus/i3/trunk

Files:

• am/i3_test.am (modified) (1 diff)
• src/mil/include/mil/Debug.h (modified) (1 diff)
• src/mil/include/mil/Module.h (modified) (2 diffs)
• src/mil/include/mil/ModuleExecuteProxy.h (modified) (1 diff)
• src/mil/include/mil/PrecompiledHeaders.h (modified) (1 diff)
• src/mil/include/mil/Thread.h (modified) (2 diffs)
• src/mil/include/mil/gui-cocoa/GuiModule.h (modified) (4 diffs)

lang/objective-cplusplus/i3/trunk/am/i3_test.am

@@ -14 +14 @@
 src/${GUI_DIR}/GuiTest2.cpp
 
-i3_test_CXXFLAGS  = ${i3_CXXFLAGS}
+i3_test_CXXFLAGS  = ${i3_CXXFLAGS} -frtti
 i3_test_LDFLAGS   = ${i3_LDFLAGS}
 i3_test_LDADD     = ${i3_LDADD}

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Debug.h

@@ -13 +13 @@
 extern class halt***** halt;
 
-#define debug (mil::log::Logger(__FILE__,__LINE__))
-#define halt (mil::log::Logger(__FILE__,__LINE__,true))
+#define debug (::mil::log::Logger(__FILE__,__LINE__))
+#define halt (::mil::log::Logger(__FILE__,__LINE__,true))
 
 #ifdef NDEBUG

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Module.h

@@ -85 +85 @@
     }
 
-
     template <typename Data, typename Sender>
     static void dispatcher(void* event_, void* target_)
@@ -120 +119 @@
             p = memory;
         } else {
-            mil::pool::Producer& producer = sender.tls.producer;
+            pool::Producer& producer = sender.tls.producer;
             p = producer.malloc<sizeof(Event<T>)>();
         }

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/ModuleExecuteProxy.h

@@ -26 +26 @@
 
 
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<1>, Target> { static void execute(mil::pool::ReturnMemoryEvent<1>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<2>, Target> { static void execute(mil::pool::ReturnMemoryEvent<2>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<3>, Target> { static void execute(mil::pool::ReturnMemoryEvent<3>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<4>, Target> { static void execute(mil::pool::ReturnMemoryEvent<4>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<5>, Target> { static void execute(mil::pool::ReturnMemoryEvent<5>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<6>, Target> { static void execute(mil::pool::ReturnMemoryEvent<6>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<7>, Target> { static void execute(mil::pool::ReturnMemoryEvent<7>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<8>, Target> { static void execute(mil::pool::ReturnMemoryEvent<8>& data, Target& target) { target.tls.producer.free(data.memory);}};
-template <class Target> struct ModuleExecuteProxy<mil::pool::ReturnMemoryEvent<9>, Target> { static void execute(mil::pool::ReturnMemoryEvent<9>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<1>, Target> { static void execute(pool::ReturnMemoryEvent<1>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<2>, Target> { static void execute(pool::ReturnMemoryEvent<2>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<3>, Target> { static void execute(pool::ReturnMemoryEvent<3>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<4>, Target> { static void execute(pool::ReturnMemoryEvent<4>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<5>, Target> { static void execute(pool::ReturnMemoryEvent<5>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<6>, Target> { static void execute(pool::ReturnMemoryEvent<6>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<7>, Target> { static void execute(pool::ReturnMemoryEvent<7>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<8>, Target> { static void execute(pool::ReturnMemoryEvent<8>& data, Target& target) { target.tls.producer.free(data.memory);}};
+template <class Target> struct ModuleExecuteProxy<pool::ReturnMemoryEvent<9>, Target> { static void execute(pool::ReturnMemoryEvent<9>& data, Target& target) { target.tls.producer.free(data.memory);}};
 
 

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/PrecompiledHeaders.h

@@ -39 +39 @@
 #include "gui-cocoa/PrecompiledHeaders.h"
 
-// mutu headers
-//#include <boost/ptr_container/detail/static_move_ptr.hpp>
-//#include <boost/detail/is_incrementable.hpp>
+#ifdef __APPLE__
+#ifdef HAVE_BOOST_DETAIL_IS_INCREMENTABLE_HPP
+#define check MIL_BOOST_replace_check
+#include <boost/ptr_container/detail/static_move_ptr.hpp>
+#undef check
+#endif
 
-#define Object MIL_BOOST_LAMBDA_Object
+#ifdef HAVE_BOOST_PTR_CONTAINER_DETAIL_STATIC_MOVE_PTR_HPP
+#include <boost/detail/is_incrementable.hpp>
+#endif
+
+#define Object MIL_BOOST_replace_Object
 #include <boost/lambda/lambda.hpp>
 #undef Object
+#endif
 
 #else

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Thread.h

@@ -257 +257 @@
 void freeEvent(Event& event, Target& target) {
     if (event.owner_id == target.thread_id) {
-        mil::pool::ReturnMemoryProxy<Event::DataType>::free(&event, target.tls.producer, mil::pool::Blocks<Event>::value);
+        mil::pool::ReturnMemoryProxy<typename Event::DataType>::free(&event, target.tls.producer, mil::pool::Blocks<Event>::value);
         return;
     }
@@ -348 +348 @@
             threads[thread_id].store(reinterpret_cast<void*>(this));
         } catch (std::exception&) {
-            DebugBreak();
             halt << "can't get thread id";
         }
     }
+
     ~Thread() {
-        join();
+        this->join();
         threads[thread_id].store(NULL);
         try {

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/gui-cocoa/GuiModule.h

@@ -1 +1 @@
 #pragma once
 #include "../Mil.h"
+#include "../Atomic.h"
 #include "../Module.h"
 #include "../ModuleExecuteProxy.h"
@@ -56 +57 @@
     {
     public:
-        typedef DataType T;
+        typedef T DataType;
         T data;
     };
@@ -66 +67 @@
     Conditional c;
     bool repost;
-    mil::atomic<bool> isWaiting;
+    atomic<bool> isWaiting;
 protected:
     NSWindow *window;
@@ -117 +118 @@
             p = memory;
         } else {
-            mil::pool::Producer& producer = sender.tls.producer;
+            pool::Producer& producer = sender.tls.producer;
             p = producer.malloc<sizeof(Event<T>)>();
         }