Changeset 33771 for lang/objective-cplusplus/i3

Timestamp:

06/04/09 01:51:42 (4 years ago)

Author:

saturday06

Message:

もうだｍｐ

Location:

lang/objective-cplusplus/i3/trunk

Files:

• am/mil_test.am (modified) (2 diffs)
• src/Test1.cpp (modified) (1 diff)
• src/Test2.cpp (modified) (1 diff)
• src/gui-windows/InputWindowPlatform.cpp (modified) (1 diff)
• src/mil/src/Test1.cpp (modified) (3 diffs)
• src/mil/src/Test2.cpp (modified) (1 diff)
• windows/i3_test.vcproj (modified) (2 diffs)
• windows/mil_test.vcproj (modified) (5 diffs)

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

@@ -15 +15 @@
                     ${WARNING_OPTIONS} \
                     -I${top_srcdir}/src/mil/include \
-                    -DNDEBUG -U_DEBUG -frtti
+                    -DNDEBUG -U_DEBUG
 
 mil_test_LDFLAGS  = ${PTHREAD_LIBS} ${BOOST_LDFLAGS}
@@ -23 +23 @@
 mil_test_SOURCES  += src/mil/src/windows/WindowProcedureTest.cpp
 mil_test_LDADD    += -lgdi32 -luser32 -lpsapi -lshlwapi
+endif
+
+if WITH_CYGWIN
+# for cygwin boost/test/included/unit_test.hpp
+mil_test_CXXFLAGS += -DBOOST_DISABLE_WIN32
+mil_test_LDFLAGS  += -Wl,--enable-auto-import
 endif
 

lang/objective-cplusplus/i3/trunk/src/Test1.cpp

@@ -112 +112 @@
 #endif
 
-

lang/objective-cplusplus/i3/trunk/src/Test2.cpp

@@ -44 +44 @@
     _tsystem(cmd.c_str());
 #endif
-
+    
     _tremove(temp);
     {
         FILE* f = _tfopen(temp, _T("w"));
         BOOST_REQUIRE(f);
+#undef fprintf
         fprintf(f, "test");
         fclose(f);

lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp

@@ -470 +470 @@
                     DWORD color2 = (a << 24) | (b << 16) | (g << 8) | r ;
                     //SendMessage(hEdit, EM_SETBKGNDCOLOR, (WPARAM)0, (LPARAM)(color2));
-                    printf("");
+                    //printf("");
                 }
             }

lang/objective-cplusplus/i3/trunk/src/mil/src/Test1.cpp

@@ -5 +5 @@
 int global = 0;
 
+void create_thread(void (*func)(void*), void* data);
+
+#ifdef MIL_OS_WINDOWS
+
+struct ThreadData {
+        typedef void (*FuncType)(void*);
+        FuncType func;
+        void* data;
+};
+
+DWORD WINAPI ThreadProc(LPVOID data) {
+        ThreadData* t = (ThreadData*)data;
+        t->func(t->data);
+        delete t;
+        return 0;
+}
+
+void create_thread(void (*func)(void*), void* data) {
+        ThreadData* t = new ThreadData;
+        t->func = func;
+        t->data = data;
+        DWORD id = 0;
+        CreateThread(NULL, 0, ThreadProc, (LPVOID)t, 0, &id);
+}
+
+#else
+void create_thread(void (*func)(void*), void* data) {
+}
+#endif
 
 /* ---------------------------------------
@@ -514 +543 @@
     ttest2<FooModule>();
     ttest2<FooGuiModule>();
+
+        struct hige {
+                static void thread(void*) {
+                    ttest2<FooModule>();
+                        ttest2<FooGuiModule>();
+                }
+        };
+
+        for (int i = 0; i < 20; i++) {
+                create_thread(hige::thread, NULL);
+        }
+
     BOOST_CHECK(true);
 }
@@ -613 +654 @@
 
 #endif
+

lang/objective-cplusplus/i3/trunk/src/mil/src/Test2.cpp

@@ -330 +330 @@
     cpy_aaaaaaaaaaabbbb<long long>();
 }
+

lang/objective-cplusplus/i3/trunk/windows/i3_test.vcproj

@@ -326 +326 @@
                                 EnableFiberSafeOptimizations="true"
                                 AdditionalIncludeDirectories="..\src\;"..\src\gui-windows";..\src\mil\include;"..\src\os-windows";"..\src\os-windows\msvc""
+                                PreprocessorDefinitions=""
                                 StringPooling="true"
                                 RuntimeLibrary="2"
@@ -334 +335 @@
                                 Detect64BitPortabilityProblems="false"
                                 DebugInformationFormat="3"
-                                EnablePREfast="true"
+                                EnablePREfast="false"
                         />
                         <Tool

lang/objective-cplusplus/i3/trunk/windows/mil_test.vcproj

@@ -337 +337 @@
                                 EnableFiberSafeOptimizations="false"
                                 AdditionalIncludeDirectories="..\src\mil\include"
+                                PreprocessorDefinitions=""
                                 ExceptionHandling="2"
                                 RuntimeLibrary="2"
@@ -348 +349 @@
                                 Detect64BitPortabilityProblems="false"
                                 DebugInformationFormat="0"
-                                EnablePREfast="true"
+                                EnablePREfast="false"
                         />
                         <Tool
@@ -696 +697 @@
                         </File>
                         <File
+                                RelativePath="..\src\mil\include\mil\Debug.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mil\include\mil\os-windows\Debug.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\mil\include\mil\Debug.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\mil\include\mil\gui-windows\DummyMessageHandler-inl.h"
                                 >
@@ -716 +717 @@
                         </File>
                         <File
+                                RelativePath="..\src\mil\include\mil\GuiModule.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mil\include\mil\gui-windows\GuiModule.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\mil\include\mil\GuiModule.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\mil\include\mil\gui-windows\MessageCracker-inl.h"
                                 >
@@ -768 +769 @@
                         </File>
                         <File
+                                RelativePath="..\src\mil\include\mil\os-windows\Thread.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mil\include\mil\Thread.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\include\mil\os-windows\Thread.h"
                                 >
                         </File>