Merge pull request #28 from Rapotkinnik/upstream

[libcds.git] / tests / test-hdr / tree / hdr_ellenbintree_set.h

diff --git a/tests/test-hdr/tree/hdr_ellenbintree_set.h b/tests/test-hdr/tree/hdr_ellenbintree_set.h
index 08658ef5ecc12aeb1db8564131cd5760202f4b94..98668fc6a81298086ca82627bc46f8d95382a07e 100644 (file)
--- a/tests/test-hdr/tree/hdr_ellenbintree_set.h
+++ b/tests/test-hdr/tree/hdr_ellenbintree_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_ELLENBINTREE_SET_H
-#define CDSHDRTEST_ELLENBINTREE_SET_H
+#ifndef CDSTEST_HDR_ELLENBINTREE_SET_H
+#define CDSTEST_HDR_ELLENBINTREE_SET_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -187,7 +187,7 @@ namespace tree {
                 for ( int * p = pFirst; p != pLast; ++p, ++i )
                     *p = i;
 
-                std::random_shuffle( pFirst, pLast );
+                shuffle( pFirst, pLast );
             }
 
             ~data_array()
@@ -205,12 +205,12 @@ namespace tree {
         struct find_functor
         {
             template <typename T>
-            void operator()( value_type& i, T& val )
+            void operator()( value_type& i, T& /*val*/ )
             {
                 ++i.stat.nFindFuncCall;
             }
             template <typename T>
-            void operator()( value_type& i, T const& val )
+            void operator()( value_type& i, T const& /*val*/ )
             {
                 ++i.stat.nFindConstFuncCall;
             }
@@ -822,4 +822,4 @@ namespace tree {
     };
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_ELLENBINTREE_SET_H
+#endif // #ifndef CDSTEST_HDR_ELLENBINTREE_SET_H