X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cds%2Fos%2Fwin%2Fthread.h;h=0e3d66466d55b4f1cd7230c9587530366c39cbee;hb=3683a950e8f85ea3407320270aa428fba7ebf71e;hp=2185d7aaa2036230409c7e77e3445e78f760f0f7;hpb=74b3d84349822d7de8d6e1038a5c418e53c5b2a3;p=libcds.git

diff --git a/cds/os/win/thread.h b/cds/os/win/thread.h
index 2185d7aa..0e3d6646 100644
--- a/cds/os/win/thread.h
+++ b/cds/os/win/thread.h
@@ -7,7 +7,7 @@
 
 namespace cds { namespace OS {
     /// Windows-specific functions
-    namespace Win32 {
+    CDS_CXX11_INLINE_NAMESPACE namespace Win32 {
 
         /// OS-specific type of thread identifier
         typedef DWORD           ThreadId;
@@ -30,11 +30,13 @@ namespace cds { namespace OS {
     }    // namespace Win32
 
     //@cond
-    using Win32::ThreadId;
-    CDS_CONSTEXPR const ThreadId c_NullThreadId = 0;
+    CDS_CONSTEXPR const Win32::ThreadId c_NullThreadId = 0;
 
+#ifndef CDS_CXX11_INLINE_NAMESPACE_SUPPORT
+    using Win32::ThreadId;
     using Win32::getCurrentThreadId;
     using Win32::isThreadAlive;
+#endif
     //@endcond
 
 }} // namespace cds::OS