Merge branch 'develop'

leapmotion · Feb 11, 2015 · 44f5cff · 44f5cff
2 parents 6ec17c3 + bd6ac37
commit 44f5cff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/autowiring/AutoNetServer.h b/autowiring/AutoNetServer.h
@@ -22,6 +22,8 @@ class AutoNetTransportHandler {
 /// </summary>
 class AutoNetTransport {
 public:
+  virtual ~AutoNetTransport(void){}
+
   /// <summary>
   /// Causes the transport to begin servicing user requests
   /// </summary>

diff --git a/src/autowiring/BasicThread.cpp b/src/autowiring/BasicThread.cpp
@@ -71,7 +71,11 @@ void BasicThread::DoRunLoopCleanup(std::shared_ptr<CoreContext>&& ctxt, std::sha
   m_running = false;
 
   // Need to ensure that "stop" and "running" are actually updated in memory before we mark "complete"
+#if autowiring_USE_LIBCXX
   std::atomic_thread_fence(std::memory_order_release);
+#else
+  (std::lock_guard<std::mutex>)state->m_lock;
+#endif
   m_completed = true;
 
   // Tell our CoreRunnable parent that we're done to ensure that our reference count will be cleared.