Changeset 36280

Timestamp:

12/27/09 18:32:14 (3 years ago)

Author:

saturday06

Message:

jijijijiji

Location:

lang/objective-cplusplus/i3/trunk

Files:

• Makefile.am (modified) (1 diff)
• autotools/tests/Makefile.am (modified) (1 diff)
• src/Common.h (modified) (2 diffs)
• src/Delegate.h (modified) (1 diff)
• src/mil/include/mil/Atomic.h (modified) (1 diff)
• src/mil/include/mil/Environment.h (modified) (2 diffs)
• src/mil/include/mil/Mil.h (modified) (2 diffs)
• src/mil/include/mil/ModuleCommon.h (modified) (1 diff)
• src/mil/include/mil/PrecompiledHeaders.h (modified) (1 diff)
• src/os-windows/Os.cpp (modified) (1 diff)
• tmp/main5.cpp (modified) (2 diffs)

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

@@ -96 +96 @@
 
 if WITH_OS_WINDOWS
+
+DISTCHECK_CONFIGURE_FLAGS += --enable-threads=win32
+
 if WITH_GUI_WINDOWS
 

lang/objective-cplusplus/i3/trunk/autotools/tests/Makefile.am

@@ -3 +3 @@
 AUTOM4TE = autom4te
 DISTCLEANFILES = $(top_builddir)/i3_test$(EXEEXT) $(top_builddir)/mil_test$(EXEEXT)
+
+atconfig: $(top_builddir)/config.status
+        cd $(top_builddir) && $(SHELL) config.status
 
 check-local: atconfig atlocal $(TESTSUITE)

lang/objective-cplusplus/i3/trunk/src/Common.h

@@ -1 +1 @@
 #pragma once
 
-#if defined(HAVE_CONFIG_H) && !defined(PACKAGE_NAME)
-#include <config.h>
-#endif
+#include <mil/Mil.h>
+#include <mil/Atomic.h>
+#include <mil/Thread.h>
+#include <mil/DoubleBuffer.h>
 
 #ifdef _MSC_VER
@@ -60 +61 @@
 #endif
 
-// mil
-#include <mil/Mil.h>
-#include <mil/Atomic.h>
-#include <mil/Thread.h>
-#include <mil/DoubleBuffer.h>
-
 #ifdef MIL_OS_WINDOWS
 #  include "os-windows/Os.h"

lang/objective-cplusplus/i3/trunk/src/Delegate.h

@@ -18 +18 @@
 
     template <typename T> void execute(T& event);
+    template <typename T> void execute_hook_(T& event) {}
     template <typename T> void beforeExecute(T& event) {}
     template <typename T> void afterExecute(T& event) {}

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

@@ -2 +2 @@
 
 #include "Mil.h"
-
-/*
-#ifdef InterlockedExchangePointer
-#define MIL_INTERLOCKED
-#elif defined(_GNUC_) && _GNUC_ >= 4 && 0
-#define MIL_INTERLOCKED
-#include <stdint.h>
-static inline int32_t InterlockedCompareExchange(volatile int32_t *dest, int32_t exch, int32_t comp)
-{
-    return __sync_val_compare_and_swap(dest, exch, comp);
-}
-static inline void* InterlockedCompareExchangePointer(volatile void* *dest, void* exch, void* comp)
-{
-    return __sync_val_compare_and_swap(dest, exch, comp);
-}
-static inline int32_t InterlockedIncrement(volatile int32_t *dest)
-{
-    return  __sync_fetch_and_add(dest, 1) + 1;
-}
-static inline int32_t InterlockedDecrement(volatile int32_t *dest)
-{
-    return  __sync_fetch_and_sub(dest, 1) - 1;
-}
-static inline int32_t InterlockedExchange(volatile int32_t *dest, int32_t exch)
-{
-    return  __sync_lock_test_and_set(dest, exch);
-}
-static inline void* InterlockedExchangePointer(volatile void* *dest, void* exch)
-{
-    return  __sync_lock_test_and_set(dest, exch);
-}
-static inline int32_t InterlockedExchangeAdd(volatile int32_t *dest, int32_t add)
-{
-    return   __sync_fetch_and_add(dest, add);
-}
-
-#endif
-*/
 
 #ifdef HAVE_GCC_ATOMIC_OPERATIONS

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

@@ -2 +2 @@
 
 // guess environment
+
+#if defined(HAVE_CONFIG_H) && !defined(PACKAGE_NAME)
+#include <config.h>
+#endif
+
+#if !defined(_DEBUG) && !defined(NDEBUG)
+#  define NDEBUG
+#endif
+
+#if defined(NDEBUG) && defined(_DEBUG)
+#error
+#endif
+
 #if defined(MIL_OS_WINDOWS) &&  defined(MIL_OS_UNIX)
 #  error
@@ -22 +35 @@
 #endif
 
-#if defined(NDEBUG) && defined(_DEBUG)
-#error
-#endif

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

@@ -4 +4 @@
  * MI Library
  */
+#include "PrecompiledHeaders.h"
 #include "Environment.h"
-#include "PrecompiledHeaders.h"
+
 #include "FilterException.h"
 
@@ -24 +25 @@
 #include "MscCrt.h"
 #include "Debug.h"
-#include "Atomic.h"
 
 #ifndef decltype

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

@@ -151 +151 @@
 
         template <class Event>
-        void execute_hook_(Event&) {}
+    void execute_hook_(Event&) {};
 
         template <class Event>
-    void execute_hook(Event&) // no bracket
-
+    void execute_hook(Event&) {}; // no bracket
 
     ModuleCommon() : tls(this->thread_id) {

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

@@ -6 +6 @@
 #pragma once
 
-#include "Environment.h"
-//#ifndef NDEBUG
-
 #ifdef _MSC_VER
-
-#  if !defined(_DEBUG) && !defined(NDEBUG)
-#    define NDEBUG
-#  endif
 
 #pragma warning(push)

lang/objective-cplusplus/i3/trunk/src/os-windows/Os.cpp

@@ -117 +117 @@
         PACL pDacl = NULL;
         EXPLICIT_ACCESS explicitAccess = {};
-
+        TCHAR everyone[] = _T("Everyone");
         BuildExplicitAccessWithName(
-            &explicitAccess, _T("Everyone"),
+            &explicitAccess, everyone,
             GENERIC_READ | FILE_ADD_SUBDIRECTORY,
             GRANT_ACCESS,

lang/objective-cplusplus/i3/trunk/tmp/main5.cpp

@@ -6 +6 @@
 int get_native_thread_id() {
     return GetCurrentThreadId();
+}
+int sleep(int seconds) {
+    Sleep(seconds * 1000);
+    return 0;
 }
 #else
@@ -96 +100 @@
     }
 
-//    {
-//        MyThread* thread = [[MyThread alloc] init];
-//        thread->thread_id = 1;
-//        [NSThread detachNewThreadSelector:@selector(startThread) toTarget:thread withObject:nil];
-//    }
+    {
+        MyThread* a = [[MyThread alloc] init];
+        a->thread_id = 1;
+        [NSThread detachNewThreadSelector:@selector(startThread) toTarget:a withObject:nil];
+    }
 
     sleep(2);