formatting

[libcds.git] / test / stress / map / find_string / map_find_string.cpp

diff --git a/test/stress/map/find_string/map_find_string.cpp b/test/stress/map/find_string/map_find_string.cpp
index 068dd8882fc0232c52bc949f196d4ec6037a7524..7da0e8dd335a1a65dc12738f93aa583d6839993b 100644 (file)
--- a/test/stress/map/find_string/map_find_string.cpp
+++ b/test/stress/map/find_string/map_find_string.cpp
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (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:
 
@@ -25,14 +25,14 @@
     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.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "map_find_string.h"
 #include <cds_test/hash_func.h>
 
 namespace map {
-    
+
     size_t Map_find_string::s_nThreadCount = 8;
     size_t Map_find_string::s_nMapSize = 10000000;
     size_t Map_find_string::s_nMaxLoadFactor = 8;
@@ -140,7 +140,7 @@ namespace map {
         hasher h;
         for ( size_t i = 0; i < s_arrString.size(); ++i ) {
             hash_type hash = h( s_arrString.at( i ));
-            if ( mapHash.insert( std::make_pair( hash, i ) ).second ) {
+            if ( mapHash.insert( std::make_pair( hash, i )).second ) {
                 if ( ++nDiffHash >= nSize )
                     break;
                 bool bExists = rand( 100 ) <= s_nPercentExists;
@@ -195,5 +195,15 @@ namespace map {
         return lf;
     }
 
-    INSTANTIATE_TEST_CASE_P( a, Map_find_string_LF, ::testing::ValuesIn( Map_find_string::get_load_factors() ) );
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+    static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+    {
+        return std::to_string( p.param );
+    }
+    INSTANTIATE_TEST_CASE_P( a, Map_find_string_LF, ::testing::ValuesIn( Map_find_string::get_load_factors()), get_test_parameter_name );
+#else
+    INSTANTIATE_TEST_CASE_P( a, Map_find_string_LF, ::testing::ValuesIn( Map_find_string::get_load_factors()));
+#endif
+
+
 } // namespace map