Remove cds/details/std/tnhread.h, using STL <thread> instead

diff --git a/cds/algo/backoff_strategy.h b/cds/algo/backoff_strategy.h
index 24852bbafb294811314be6de3fde571b2e75f331..fd02f6599e2fcbfb97ed9c69e7a2916619409865 100644 (file)
--- a/cds/algo/backoff_strategy.h
+++ b/cds/algo/backoff_strategy.h
@@ -16,8 +16,8 @@
     2009.09.10  Maxim Khiszinsky    reset() function added
 */
 
     2009.09.10  Maxim Khiszinsky    reset() function added
 */
 

+#include <thread>

 #include <cds/compiler/backoff.h>
 #include <cds/compiler/backoff.h>

-#include <cds/details/std/thread.h>

 #include <cds/details/std/chrono.h>
 
 namespace cds {
 #include <cds/details/std/chrono.h>
 
 namespace cds {


@@ -74,8 +74,7 @@ namespace cds {
             //@cond
             void operator ()()
             {
             //@cond
             void operator ()()
             {

-                cds_std::this_thread::yield();
-                //OS::yield();
+                std::this_thread::yield();

             }
 
             template <typename Predicate>
             }
 
             template <typename Predicate>


@@ -368,7 +367,7 @@ namespace cds {
             //@cond
             void operator()() const
             {
             //@cond
             void operator()() const
             {

-                cds_std::this_thread::sleep_for( duration_type( m_nTimeout ));
+                std::this_thread::sleep_for( duration_type( m_nTimeout ));

             }
 
             template <typename Predicate>
             }
 
             template <typename Predicate>


@@ -377,7 +376,7 @@ namespace cds {
                 for ( unsigned int i = 0; i < m_nTimeout; i += 2 ) {
                     if ( pr() )
                         return true;
                 for ( unsigned int i = 0; i < m_nTimeout; i += 2 ) {
                     if ( pr() )
                         return true;

-                    cds_std::this_thread::sleep_for( duration_type( 2 ));
+                    std::this_thread::sleep_for( duration_type( 2 ));

                 }
                 return false;
             }
                 }
                 return false;
             }

diff --git a/cds/details/std/thread.h b/cds/details/std/thread.h
deleted file mode 100644 (file)
index ff7af37..0000000
--- a/cds/details/std/thread.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_DETAILS_STD_THREAD_H
-#define __CDS_DETAILS_STD_THREAD_H
-
-//@cond
-
-#include <cds/details/defs.h>
-
-#ifdef CDS_CXX11_STDLIB_THREAD
-#   include <thread>
-    namespace cds_std {
-        using std::thread;
-        namespace this_thread = std::this_thread;
-    }
-#else
-#   include <boost/thread/thread.hpp>
-    namespace cds_std {
-        using boost::thread;
-        namespace this_thread = boost::this_thread;
-    }
-#endif
-
-//@endcond
-
-#endif // #ifndef __CDS_DETAILS_STD_THREAD_H

diff --git a/cds/urcu/dispose_thread.h b/cds/urcu/dispose_thread.h
index acad1b44148cfe7cf226c839822f127d9260183e..9ebb4bd58ed2bf8ad3719251bd7b7c72e69e19a3 100644 (file)
--- a/cds/urcu/dispose_thread.h
+++ b/cds/urcu/dispose_thread.h
@@ -4,7 +4,7 @@
 #define _CDS_URCU_DISPOSE_THREAD_H
 
 #include <memory>
 #define _CDS_URCU_DISPOSE_THREAD_H
 
 #include <memory>

-#include <cds/details/std/thread.h>
+#include <thread>

 #include <cds/details/std/mutex.h>
 #include <cds/details/std/condition_variable.h>
 #include <cds/details/aligned_type.h>
 #include <cds/details/std/mutex.h>
 #include <cds/details/std/condition_variable.h>
 #include <cds/details/aligned_type.h>


@@ -26,9 +26,9 @@ namespace cds { namespace urcu {
         typedef Buffer  buffer_type ;   ///< Buffer type
     private:
         //@cond
         typedef Buffer  buffer_type ;   ///< Buffer type
     private:
         //@cond

-        typedef cds_std::thread                     thread_type;
-        typedef cds_std::mutex                      mutex_type;
-        typedef cds_std::condition_variable         condvar_type;
+        typedef std::thread                 thread_type;
+        typedef cds_std::mutex              mutex_type;
+        typedef cds_std::condition_variable condvar_type;

         typedef cds_std::unique_lock< mutex_type >  unique_lock;
 
         class dispose_thread_starter: public thread_type
         typedef cds_std::unique_lock< mutex_type >  unique_lock;
 
         class dispose_thread_starter: public thread_type

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 9a283b87a2def4f90fa43ce515f00ee63b92bb4f..0d665996c4fef4259ca459827e0e3fd1d4b093d0 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -730,9 +730,7 @@
     <ClInclude Include="..\..\..\cds\details\numtraits.h" />\r
     <ClInclude Include="..\..\..\cds\details\static_functor.h" />\r
     <ClInclude Include="..\..\..\cds\details\std\condition_variable.h" />\r
     <ClInclude Include="..\..\..\cds\details\numtraits.h" />\r
     <ClInclude Include="..\..\..\cds\details\static_functor.h" />\r
     <ClInclude Include="..\..\..\cds\details\std\condition_variable.h" />\r

-    <ClInclude Include="..\..\..\cds\details\std\memory.h" />\r

     <ClInclude Include="..\..\..\cds\details\std\mutex.h" />\r
     <ClInclude Include="..\..\..\cds\details\std\mutex.h" />\r

-    <ClInclude Include="..\..\..\cds\details\std\thread.h" />\r

     <ClInclude Include="..\..\..\cds\details\std\chrono.h" />\r
     <ClInclude Include="..\..\..\cds\gc\all.h" />\r
     <ClInclude Include="..\..\..\cds\gc\exception.h" />\r
     <ClInclude Include="..\..\..\cds\details\std\chrono.h" />\r
     <ClInclude Include="..\..\..\cds\gc\all.h" />\r
     <ClInclude Include="..\..\..\cds\gc\exception.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 4346d06a3d7ad567aa70fb41aa57411cced308a5..5d3b62680c903ffcdece8df064125f9c1affe643 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -878,9 +878,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\deque_stat.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\cds\intrusive\deque_stat.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r

-    <ClInclude Include="..\..\..\cds\details\std\memory.h">\r
-      <Filter>Header Files\cds\details\std</Filter>\r
-    </ClInclude>\r

     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r


@@ -1064,9 +1061,6 @@
     <ClInclude Include="..\..\..\cds\details\std\mutex.h">\r
       <Filter>Header Files\cds\details\std</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\cds\details\std\mutex.h">\r
       <Filter>Header Files\cds\details\std</Filter>\r
     </ClInclude>\r

-    <ClInclude Include="..\..\..\cds\details\std\thread.h">\r
-      <Filter>Header Files\cds\details\std</Filter>\r
-    </ClInclude>\r

     <ClInclude Include="..\..\..\cds\details\std\chrono.h">\r
       <Filter>Header Files\cds\details\std</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\cds\details\std\chrono.h">\r
       <Filter>Header Files\cds\details\std</Filter>\r
     </ClInclude>\r