Uses unique_ptr for Threads

[libcds.git] / cds / details / binary_functor_wrapper.h

diff --git a/cds/details/binary_functor_wrapper.h b/cds/details/binary_functor_wrapper.h
index 1acbb2a5f35bdf9c11094921aa16d6f6cd4d8e03..568f0d9f0eca9bd5e2df7a24f97514b8e43232f0 100644 (file)
--- a/cds/details/binary_functor_wrapper.h
+++ b/cds/details/binary_functor_wrapper.h
@@ -1,7 +1,35 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_DETAILS_BINARY_FUNCTOR_WRAPPER_H
-#define __CDS_DETAILS_BINARY_FUNCTOR_WRAPPER_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_DETAILS_BINARY_FUNCTOR_WRAPPER_H
+#define CDSLIB_DETAILS_BINARY_FUNCTOR_WRAPPER_H
 
 #include <cds/details/defs.h>
 
@@ -39,24 +67,29 @@ namespace cds { namespace details {
         }
     };
 
-#ifdef CDS_CXX11_TEMPLATE_ALIAS_SUPPORT
+    struct trivial_accessor
+    {
+        template <typename T>
+        T const& operator()( T const& p ) const
+        {
+            return p;
+        }
+
+        template <typename T>
+        T& operator()( T& p ) const
+        {
+            return p;
+        }
+    };
+
     template <typename ArgType, typename Predicate, typename Accessor>
     using predicate_wrapper = binary_functor_wrapper< bool, Predicate, ArgType, Accessor>;
 
     template <typename ArgType, typename Compare, typename Accessor>
     using compare_wrapper = binary_functor_wrapper< int, Compare, ArgType, Accessor>;
-#else
-    template <typename ArgType, typename Predicate, typename Accessor>
-    struct predicate_wrapper: public binary_functor_wrapper< bool, Predicate, ArgType, Accessor>
-    {};
-
-    template <typename ArgType, typename Compare, typename Accessor>
-    struct compare_wrapper: public binary_functor_wrapper< int, Compare, ArgType, Accessor >
-    {};
-#endif
 
 }} // namespace cds::details
 
 //@endcond
 
-#endif // #ifndef __CDS_DETAILS_BINARY_FUNCTOR_WRAPPER_H
+#endif // #ifndef CDSLIB_DETAILS_BINARY_FUNCTOR_WRAPPER_H