[Rivet-svn] rivet: Make clang happy by explicit user of std::toupper and std...

Rivet Mercurial rivet at projects.hepforge.org
Wed Sep 14 16:00:02 BST 2016


details:   https://rivet.hepforge.org/hg/rivet/rev/72917475e396
branches:  release-2-5-x
changeset: 5481:72917475e396
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Wed Sep 14 15:54:42 2016 +0100
description:
Make clang happy by explicit user of std::toupper and std::tolower

diffs (30 lines):

--- a/ChangeLog	Wed Sep 14 14:11:09 2016 +0100
+++ b/ChangeLog	Wed Sep 14 15:54:42 2016 +0100
@@ -1,3 +1,7 @@
+2016-09-14  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Explicit std::toupper and std::tolower to make clang happy
+
 2016-09-14  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add ATLAS Run 2 0-lepton SUSY and monojet search papers (ATLAS_2016_I1452559, ATLAS_2016_I1458270)
--- a/include/Rivet/Tools/Utils.hh	Wed Sep 14 14:11:09 2016 +0100
+++ b/include/Rivet/Tools/Utils.hh	Wed Sep 14 15:54:42 2016 +0100
@@ -143,7 +143,7 @@
   /// Convert a string to lower-case
   inline string toLower(const string& s) {
     string out = s;
-    std::transform(out.begin(), out.end(), out.begin(), (int(*)(int)) tolower);
+    std::transform(out.begin(), out.end(), out.begin(), (int(*)(int)) std::tolower);
     return out;
   }
 
@@ -151,7 +151,7 @@
   /// Convert a string to upper-case
   inline string toUpper(const string& s) {
     string out = s;
-    std::transform(out.begin(), out.end(), out.begin(), (int(*)(int)) toupper);
+    std::transform(out.begin(), out.end(), out.begin(), (int(*)(int)) std::toupper);
     return out;
   }
 


More information about the Rivet-svn mailing list