[Rivet] compilation fix

[Holger Schulz]

Hi David,

after running hg pull I now have this:


o    changeset:   5482:79df27cbf133
|\   tag:         tip
| |  parent:      5304:cd1f9786db68
| |  parent:      5480:eaf6a4534a7b
| |  user:        David Grellscheid <david.grellscheid at durham.ac.uk>
| |  date:        Thu Sep 15 09:31:07 2016 +0100
| |  summary:     Merge from 2.5.x branch
| |
| | @  changeset:   5481:72917475e396
| |/   branch:      release-2-5-x
| |    user:        Holger Schulz <holger.schulz at durham.ac.uk>
| |    date:        Wed Sep 14 15:54:42 2016 +0100
| |    summary:     Make clang happy by explicit user of std::toupper
and std::tolower
| |
| o  changeset:   5480:eaf6a4534a7b
| |  branch:      release-2-5-x
| |  user:        David Grellscheid <david.grellscheid at durham.ac.uk>
| |  date:        Wed Sep 14 14:11:09 2016 +0100
| |  summary:     attempted fix for new python m4 Macports issue



On 15/09/16 11:47, David Grellscheid wrote:
> Which two heads do you mean? I see a consistent set on the server:
>
> release-2-5-x               5482:72917475e396
> default                     5481:79df27cbf133
> release-2-4-x               5291:cb910cb5549d (inactive)
> default-hepmc3              5127:7e828fefcb04 (inactive)
>
>   David
>
>
> On 15/09/16 11:42, Holger Schulz wrote:
>> Hmm there was a recent merge by David, now there is two heads.
>>
>> In order for me not to break anything --- how should we proceed?
>>
>> Holger
>>
>>
>> On 15/09/16 10:46, Andy Buckley wrote:
>>> Apologies, of course it was you that made the commit! Good timing :-)
>>>
>>>
>>> On 15/09/16 10:42, Holger Schulz wrote:
>>>> Hmm  funny, I check exactly that in yesterday afternoon.
>>>>
>>>> Holger
>>>>
>>>>
>>>> On 15/09/16 10:27, Andy Buckley wrote:
>>>>> Hasn't this already been done? (By you?) I thought I saw it come
>>>>> through a couple of days ago on the hg commits mailing list...
>>>>>
>>>>> Andy
>>>>>
>>>>>
>>>>> On 15/09/16 08:43, David Grellscheid wrote:
>>>>>> Hi,
>>>>>>
>>>>>> please don't apply this on a C++-98 branch, it'll break on non-clang
>>>>>> setups. On the branches that are -11 by default, use std::tolower.
>>>>>>
>>>>>>   David
>>>>>>
>>>>>>
>>>>>> On 15/09/16 06:12, Dmitry Kalinkin wrote:
>>>>>>> Hi again,
>>>>>>>
>>>>>>> Just wanted to check if my email got through. I don't see it on the
>>>>>>> list's archive at
>>>>>>> https://www.hepforge.org/lists-archive/rivet/2016-September/thread.html
>>>>>>>
>>>>>>>
>>>>>>> Cheers,
>>>>>>> Dmitry
>>>>>>>
>>>>>>> On Wed, Sep 7, 2016 at 12:28 AM, Dmitry Kalinkin
>>>>>>> <dmitry.kalinkin at gmail.com> wrote:
>>>>>>>> Dear Rivet developers,
>>>>>>>>
>>>>>>>> The patch below fixes compilation on clang. Hope you will find it
>>>>>>>> useful.
>>>>>>>>
>>>>>>>> Thanks,
>>>>>>>>
>>>>>>>> Dmitry
>>>>>>>>
>>>>>>>> diff --git a/include/Rivet/Tools/Utils.hh
>>>>>>>> b/include/Rivet/Tools/Utils.hh
>>>>>>>> --- a/include/Rivet/Tools/Utils.hh
>>>>>>>> +++ b/include/Rivet/Tools/Utils.hh
>>>>>>>> @@ -101,7 +101,7 @@ namespace Rivet {
>>>>>>>>    /// 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)) ::tolower);
>>>>>>>>      return out;
>>>>>>>>    }
>>>>>>>>
>>>>>>>> @@ -109,7 +109,7 @@ namespace Rivet {
>>>>>>>>    /// 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)) ::toupper);
>>>>>>>>      return out;
>>>>>>>>    }
>>>>>>>>
>>>>>>>>
>>>>>>> _______________________________________________
>>>>>>> Rivet mailing list
>>>>>>> Rivet at projects.hepforge.org
>>>>>>> https://www.hepforge.org/lists/listinfo/rivet
>>>>>>>
>>>>>> _______________________________________________
>>>>>> Rivet mailing list
>>>>>> Rivet at projects.hepforge.org
>>>>>> https://www.hepforge.org/lists/listinfo/rivet
>>>>>>
>>>>>
>>>