Changeset 36267 for lang/objective-cplusplus/i3/trunk/src

Timestamp:

12/24/09 21:05:08 (3 years ago)

Author:

saturday06

Message:

asasasas

Location:

lang/objective-cplusplus/i3/trunk/src/mil

Files:

• include/mil/FilterException.h (modified) (1 diff)
• include/mil/StaticData.cpp (modified) (3 diffs)
• include/mil/StaticDataObjC.cpp (modified) (1 diff)
• src/test/DoubleBuffer.cpp (modified) (1 diff)
• src/test/Module.cpp (modified) (3 diffs)

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

@@ -5 +5 @@
 #endif
 
-    int filter_exception_and_start(int argc, char** argv, int (*start)(int, char**));
+int filter_exception_and_start(int argc, char** argv, int (*start)(int, char**));
+
 #ifdef __OBJC__
-    int filter_exception_and_start_objc(int argc, char** argv, int (*start)(int, char**));
+int filter_exception_and_start_objc(int argc, char** argv, int (*start)(int, char**));
 #define filter_exception_and_start filter_exception_and_start_objc
 #endif
+
 #ifdef __cplusplus
 }

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/StaticData.cpp

@@ -5 +5 @@
 #include "ModuleCommon.h"
 #include "Intl.h"
+#include "FilterException.h"
+#include "Intl.h"
+
+#undef filter_exception_and_start
 
 //#include <fecti/Utility/FBlockMemoryAllocator/FAllocatorImpl_Block.cpp>
@@ -99 +103 @@
 }
 
-#undef filter_exception_and_start
 extern "C" int filter_exception_and_start(int argc, char** argv, int (*start)(int, char**)) {
     return start(argc, argv);
@@ -120 +123 @@
 
 #ifdef __OBJC__
+
+int filter_exception_and_start_objc(int argc, char** argv, int (*start)(int, char**)) {
+    int result = EXIT_FAILURE;
+
+    NS_DURING 
+    {
+        NSAutoreleasePool* pool = [NSAutoreleasePool alloc];
+        [pool init];
+        result = filter_exception_and_start(argc, argv, start);
+    }
+    NS_HANDLER 
+    {
+        fprintf(stderr, gettext("Objective-C Exception, name=[%s] reason=[%s]\n"), [[localException name] cString], [[localException reason] cString]);
+    }
+    NS_ENDHANDLER
+
+    return result;
+}
+
+@implementation WorkerThread
+- (void)setData:
+(void* (*)(void*))routine_ arg:
+(void*)arg_ {
+    routine = routine_;
+    arg = arg_;
+}
+- (void)start {
+    routine(arg);
+}
+@end
+
 namespace mil {
 class CocoaThreadManager : boost::noncopyable {

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/StaticDataObjC.cpp

@@ -1 @@
-#include "PrecompiledHeaders.h"
-#include "Thread.h"
-#include "FilterException.h"
-#include "Intl.h"
-
-#undef filter_exception_and_start
-
-int filter_exception_and_start_objc(int argc, char** argv, int (*start)(int, char**)) {
-    int result = EXIT_FAILURE;
-
-    NS_DURING 
-    {
-        NSAutoreleasePool* pool = [NSAutoreleasePool alloc];
-        [pool init];
-        result = filter_exception_and_start(argc, argv, start);
-    }
-    NS_HANDLER 
-    {
-        fprintf(stderr, gettext("Objective-C Exception, name=[%s] reason=[%s]\n"), [[localException name] cString], [[localException reason] cString]);
-    }
-    NS_ENDHANDLER
-
-    return result;
-}
-
-@implementation WorkerThread
-- (void)setData:
-(void* (*)(void*))routine_ arg:
-(void*)arg_ {
-    routine = routine_;
-    arg = arg_;
-}
-- (void)start {
-    routine(arg);
-}
-@end
-

lang/objective-cplusplus/i3/trunk/src/mil/src/test/DoubleBuffer.cpp

@@ -1 +1 @@
 #include <mil/PrecompiledHeaders.h>
+
+
+

lang/objective-cplusplus/i3/trunk/src/mil/src/test/Module.cpp

@@ -785 +785 @@
 
 struct FooModule : mil::Module<FooModule> {
-    void run() {
-        loop();
-    }
-
     void execute(Plus6& e) {
         global += 6;
@@ -795 +791 @@
 
 struct BarModule : mil::Module<FooModule> {
-    void run() {
-        loop();
-    }
 };
 
@@ -904 +897 @@
 
 struct FooModule : mil::Module<FooModule> {
-    void run() {
-        loop();
-    }
-
     void execute(Plus5& e) {
         global += 5;