Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...

[libcds.git] / cds / compiler / gcc / x86 / cxx11_atomic.h

diff --git a/cds/compiler/gcc/x86/cxx11_atomic.h b/cds/compiler/gcc/x86/cxx11_atomic.h
index 52fc73983d4267e6e6583b1d179ece94e602e1d1..10c96eca26815bd06a4f631ff29c959265f94014 100644 (file)
--- a/cds/compiler/gcc/x86/cxx11_atomic.h
+++ b/cds/compiler/gcc/x86/cxx11_atomic.h
@@ -1,13 +1,41 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_COMPILER_GCC_X86_CXX11_ATOMIC_H
-#define __CDS_COMPILER_GCC_X86_CXX11_ATOMIC_H
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
+
+    Source code repo: http://github.com/khizmax/libcds/
+    Download: http://sourceforge.net/projects/libcds/files/
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef CDSLIB_COMPILER_GCC_X86_CXX11_ATOMIC_H
+#define CDSLIB_COMPILER_GCC_X86_CXX11_ATOMIC_H
 
 #include <cstdint>
 #include <cds/compiler/gcc/x86/cxx11_atomic32.h>
 
 //@cond
-namespace cds { namespace cxx11_atomics {
+namespace cds { namespace cxx11_atomic {
     namespace platform { CDS_CXX11_INLINE_NAMESPACE namespace gcc { CDS_CXX11_INLINE_NAMESPACE namespace x86 {
 
         //-----------------------------------------------------------------------------
@@ -61,6 +89,7 @@ namespace cds { namespace cxx11_atomics {
                 );
             assert( pSrc );
             assert( cds::details::is_aligned( pSrc, 8 ));
+            CDS_UNUSED( order );
 
             T CDS_DATA_ALIGNMENT(8) v;
             __asm__ __volatile__(
@@ -178,7 +207,7 @@ namespace cds { namespace cxx11_atomics {
         using namespace gcc::x86;
 #endif
     }   // namespace platform
-}}  // namespace cds::cxx11_atomics
+}}  // namespace cds::cxx11_atomic
 //@endcond
 
-#endif // #ifndef __CDS_COMPILER_GCC_X86_CXX11_ATOMIC_H
+#endif // #ifndef CDSLIB_COMPILER_GCC_X86_CXX11_ATOMIC_H