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

[libcds.git] / cds / algo / elimination.h

diff --git a/cds/algo/elimination.h b/cds/algo/elimination.h
index e85207b69441e600908866390067a1e1bfd16aaa..597e0f2458a8257e0698459b521739e2ca84fb04 100644 (file)
--- a/cds/algo/elimination.h
+++ b/cds/algo/elimination.h
@@ -1,11 +1,39 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_ALGO_ELIMINATION_H
-#define __CDS_ALGO_ELIMINATION_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_ALGO_ELIMINATION_H
+#define CDSLIB_ALGO_ELIMINATION_H
 
 #include <cds/algo/elimination_tls.h>
 #include <cds/algo/elimination_opt.h>
-#include <cds/cxx11_atomic.h>
+#include <cds/algo/atomic.h>
 #include <cds/threading/model.h>
 
 namespace cds { namespace algo {
@@ -55,4 +83,4 @@ namespace cds { namespace algo {
     } // namespace elimination
 }} // namespace cds::algo
 
-#endif // __CDS_ALGO_ELIMINATION_H
+#endif // CDSLIB_ALGO_ELIMINATION_H