Made cds::OS children namespaces inline, removed OS-specific syserror.h headers

[libcds.git] / cds / os / win / alloc_aligned.h

diff --git a/cds/os/win/alloc_aligned.h b/cds/os/win/alloc_aligned.h
index 061afc4f292d44daf0f168ef1f20e1a9e6a7b410..5a6bf1df677efc19ae4392d735d0992b65b44646 100644 (file)
--- a/cds/os/win/alloc_aligned.h
+++ b/cds/os/win/alloc_aligned.h
@@ -7,7 +7,7 @@
 
 //@cond none
 namespace cds { namespace OS {
-    namespace Win32 {
+    CDS_CXX11_INLINE_NAMESPACE namespace Win32 {
         /// Allocates memory on a specified alignment boundary
         static inline void * aligned_malloc(
             size_t nSize,       ///< Size of the requested memory allocation
@@ -26,8 +26,10 @@ namespace cds { namespace OS {
         }
     }   // namespace Win32
 
+#ifndef CDS_CXX11_INLINE_NAMESPACE_SUPPORT
     using Win32::aligned_malloc;
     using Win32::aligned_free;
+#endif
 
 }} // namespace cds::OS
 //@endcond