remove use of std::ptr_fun

JohnCremona · Dec 12, 2023 · c4a9d5b · c4a9d5b
1 parent dfc289a
commit c4a9d5b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/libsrc/eclib/templates.h b/libsrc/eclib/templates.h
@@ -61,7 +61,6 @@ using std::map;
 using std::unordered_map;
 using std::min;
 using std::max;
-using std::ptr_fun;
 using std::pair;
 using std::sort;
 using std::abs;

diff --git a/libsrc/saturate.cc b/libsrc/saturate.cc
@@ -356,15 +356,15 @@ int saturator::do_saturation(int pp, int maxntries)
 int l2i(long i) {return (int)i;}
 vector<int> lv2iv(const vector<long>& v)
 {
-  vector<int> ans;
-  transform(v.begin(),v.end(),inserter(ans,ans.end()),ptr_fun(l2i));
+  vector<int> ans(v.size());
+  transform(v.begin(),v.end(),ans.begin(), l2i);
   return ans;
 }
 int i2l(int i) {return (long)i;}
 vector<long> iv2lv(const vector<int>& v)
 {
-  vector<long> ans;
-  transform(v.begin(),v.end(),inserter(ans,ans.end()),ptr_fun(i2l));
+  vector<long> ans(v.size());
+  transform(v.begin(),v.end(),ans.begin(),i2l);
   return ans;
 }
 

diff --git a/tests/ptest.cc b/tests/ptest.cc
@@ -48,10 +48,13 @@ int main()
 
  n=2310*210*64*17;
  cout<<"n = "<<n<<endl;
- vector<long> exps;
 
- transform(plist.begin(),plist.end(),inserter(exps,exps.end()),
-	   bind2nd(ptr_fun(val),n));
+ vector<long> exps(plist.size());
+ transform(plist.begin(),plist.end(),
+           exps.begin(),
+           [n](long p) {return val(p,n);}
+           );
+
  cout<<"exps = "<<exps<<endl;
 
  vector<long> plist1=primes(10);