Merge pull request #14 from leapmotion/dep-moveonly

Deprecate MoveOnly
leapmotion · Jul 31, 2014 · ec81b77 · ec81b77
2 parents 54a06fe + d2ce96b
commit ec81b77
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 48 deletions.
diff --git a/autowiring/move_only.h b/autowiring/move_only.h
diff --git a/src/autowiring/BasicThread.cpp b/src/autowiring/BasicThread.cpp
@@ -5,7 +5,6 @@
 #include "BasicThreadStateBlock.h"
 #include "ContextEnumerator.h"
 #include "fast_pointer_cast.h"
-#include "move_only.h"
 
 // Explicit instantiation of supported time point types:
 template<> bool BasicThread::WaitUntil(std::chrono::steady_clock::time_point);
@@ -146,10 +145,9 @@ bool BasicThread::Start(std::shared_ptr<Object> outstanding) {
   }
 
   // Kick off a thread and return here
-  MoveOnly<std::shared_ptr<Object>> out(std::move(outstanding));
   m_state->m_thisThread = std::thread(
-    [this, out] {
-      this->DoRun(std::move(out.value));
+    [this, outstanding] () mutable {
+      this->DoRun(std::move(outstanding));
     }
   );
   return true;

diff --git a/src/autowiring/CMakeLists.txt b/src/autowiring/CMakeLists.txt
@@ -88,7 +88,6 @@ set(Autowiring_SRCS
   ObjectPoolMonitor.cpp
   optional_ptr.h
   SatCounter.h
-  move_only.h
   MicroBolt.h
   SharedPointerSlot.h
   SlotInformation.h

diff --git a/src/autowiring/CoreJob.cpp b/src/autowiring/CoreJob.cpp
@@ -2,7 +2,6 @@
 #include "stdafx.h"
 #include "CoreJob.h"
 #include "CoreContext.h"
-#include "move_only.h"
 
 CoreJob::CoreJob(const char* name) :
   ContextMember(name),

diff --git a/src/autowiring/test/CoreJobTest.cpp b/src/autowiring/test/CoreJobTest.cpp
@@ -2,7 +2,6 @@
 #include "stdafx.h"
 #include "CoreJobTest.hpp"
 #include <autowiring/CoreJob.h>
-#include <autowiring/move_only.h>
 #include THREAD_HEADER
 #include FUTURE_HEADER
 
@@ -12,7 +11,7 @@ TEST_F(CoreJobTest, VerifySimpleProperties) {
   ASSERT_FALSE(m_create->IsInitiated()) << "CoreJob reported it could receive events before its enclosing context was created";
 
   // Create a thread which will delay for acceptance, and then quit:
-  auto future = std::async(std::launch::async, [this] { //GRAHAM
+  auto future = std::async(std::launch::async, [this] {
     m_create->DelayUntilInitiated();
   });
 
@@ -101,24 +100,6 @@ TEST_F(CoreJobTest, VerifyNoEventReceivers){
   EXPECT_FALSE(listener->m_flag) << "Lister recived event event though it wasn't initiated";
 }
 
-class CanOnlyMove {
-public:
-  CanOnlyMove(){}
-  ~CanOnlyMove(){}
-  CanOnlyMove(const CanOnlyMove& derp) = delete;
-  CanOnlyMove(CanOnlyMove&& derp){}
-};
-
-TEST_F(CoreJobTest, MoveOnly){
-  CanOnlyMove move;
-  //CanOnlyMove derp = move; //error
-
-  MoveOnly<CanOnlyMove> mo(std::move(move));
-
-  MoveOnly<CanOnlyMove> first = mo;
-  //MoveOnly<CanOnlyMove> second = mo; //error
-}
-
 TEST_F(CoreJobTest, AbandonedDispatchers) {
   auto v = std::make_shared<bool>(false);