From b1697b7e736c9b7f56b8d21d8ecc9500c9a0025c Mon Sep 17 00:00:00 2001 From: Scott Fennell Date: Tue, 24 Sep 2019 09:30:37 -0500 Subject: [PATCH] #864 remove ptr_fun missed one file --- include/trick/checkpoint_pair.hh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/trick/checkpoint_pair.hh b/include/trick/checkpoint_pair.hh index c2f350d2..78e9b9e1 100644 --- a/include/trick/checkpoint_pair.hh +++ b/include/trick/checkpoint_pair.hh @@ -32,7 +32,7 @@ int checkpoint_stl(std::pair & in_pair , std::string object_name FIRST * first = nullptr ; SECOND * second = nullptr ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); std::string type_string ; try { @@ -78,7 +78,7 @@ int checkpoint_stl(std::pair & in_pair , std::string object_name FIRST * first = nullptr ; std::string * second = nullptr ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); std::string type_string; try { type_string = stl_type_name_convert(abi::__cxa_demangle(typeid(*first).name(), 0, 0, &status )) ; @@ -117,7 +117,7 @@ int checkpoint_stl(std::pair & in_pair , std::string object_name std::string * first = nullptr ; SECOND * second = nullptr ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); var_declare << "std::string " << object_name << "_" << var_name << "_first[1]" ; @@ -152,7 +152,7 @@ int checkpoint_stl(std::pair & in_pair , std::string object_name std::string * first = nullptr ; std::string * second = nullptr ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); var_declare << "std::string " << object_name << "_" << var_name << "_first[1]" ; @@ -175,7 +175,7 @@ int checkpoint_stl(std::pair & in_pair , std::string object_name template int delete_stl(std::pair & in_stl __attribute__ ((unused)) , std::string object_name , std::string var_name ) { - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); REF2 * items_ref ; items_ref = ref_attributes((char *)(object_name + "_" + var_name + "_first").c_str()) ; if ( items_ref != NULL ) { @@ -198,7 +198,7 @@ int restore_stl(std::pair & in_pair , std::string object_name , FIRST * first ; SECOND * second ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); //message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ; first_ref = ref_attributes((char *)(object_name + "_" + var_name + "_first").c_str()) ; @@ -228,7 +228,7 @@ int restore_stl(std::pair & in_pair , std::string object_name , FIRST * first ; std::string * second ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); //message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ; first_ref = ref_attributes((char *)(object_name + "_" + var_name + "_first").c_str()) ; @@ -258,7 +258,7 @@ int restore_stl(std::pair & in_pair , std::string object_name , std::string * first ; SECOND * second ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); //message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ; first_ref = ref_attributes((char *)(object_name + "_" + var_name + "_first").c_str()) ; @@ -287,7 +287,7 @@ int restore_stl(std::pair & in_pair , std::string object_name , std::string * first ; std::string * second ; - std::replace_if(object_name.begin(), object_name.end(), std::ptr_fun(&std::ispunct), '_'); + std::replace_if(object_name.begin(), object_name.end(), static_cast(std::ispunct), '_'); //message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ; first_ref = ref_attributes((char *)(object_name + "_" + var_name + "_first").c_str()) ;