Merge pull request #268 from leapmotion/fix-libcxx

Fix libcxx problems
leapmotion · Dec 17, 2014 · abcfd25 · abcfd25
2 parents 8872471 + fcbe62f
commit abcfd25
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/autowiring/AutoPacket.h b/autowiring/AutoPacket.h
@@ -452,8 +452,16 @@ class AutoPacket:
       }
 
       // Now trigger a rescan to hit any deferred, unsatisfiable entries:
+#if autowiring_USE_LIBCXX
       for (const std::type_info* ti : {&typeid(auto_id<T>), &typeid(auto_id<Ts>)...})
         MarkUnsatisfiable(*ti);
+#else
+      bool dummy[] = {
+        (MarkUnsatisfiable(typeid(auto_id<T>)), false),
+        (MarkUnsatisfiable(typeid(auto_id<Ts>)), false)...
+      };
+      (void)dummy;
+#endif
     }),
     PulseSatisfaction(pTypeSubs, 1 + sizeof...(Ts));
   }

diff --git a/src/autowiring/CMakeLists.txt b/src/autowiring/CMakeLists.txt
@@ -2,8 +2,10 @@
 # Setup testing
 #
 
-add_googletest(test)
-add_googletest(benchmark)
+if(autowiring_USE_LIBCXX)
+  add_googletest(test)
+  add_googletest(benchmark)
+endif()
 
 #
 # Configure source files

diff --git a/src/autowiring/test/CMakeLists.txt b/src/autowiring/test/CMakeLists.txt
@@ -87,15 +87,6 @@ endif()
 add_pch(AutowiringTest_SRCS "stdafx.h" "stdafx.cpp")
 add_executable(AutowiringTest ${AutowiringTest_SRCS})
 target_link_libraries(AutowiringTest Autowiring AutowiringFixture AutoTesting)
-if(NOT WIN32 AND NOT autowiring_USE_LIBCXX)
-  find_package(Boost COMPONENTS thread atomic chrono system date_time QUIET)
-  target_link_libraries(AutowiringTest ${Boost_LIBRARIES})
-endif()
-
-# Need boost thread on android, because of our use of std::async
-if(BUILD_ANDROID)
-  target_link_libraries(AutowiringTest ${Boost_LIBRARIES})
-endif()
 
 # Need boost thread on android, because of our use of std::async
 if(BUILD_ANDROID)