diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/MetricsFunctional.h | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/LoggerAdminI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/StringUtil.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h index 08a332798f4..7bb9e1303e5 100644 --- a/cpp/include/Ice/MetricsFunctional.h +++ b/cpp/include/Ice/MetricsFunctional.h @@ -94,7 +94,7 @@ namespace IceMX template<class T, typename Y, typename Func> struct ApplyOnMember { - ApplyOnMember(Y T::*member, Func func) : func(func), member(member) + ApplyOnMember(Y T::*m, Func f) : func(f), member(m) { } @@ -126,7 +126,7 @@ template<typename T> struct Increment template<typename T> struct Add { - Add(T value) : value(value) { } + Add(T v) : value(v) { } template<typename Y> void operator()(Y& v) diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 34fef69a9e8..2b363572e8c 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -58,7 +58,7 @@ public: void deadRemoteLogger(const RemoteLoggerPrxPtr&, const LoggerPtr&, const LocalException&, const string&); - const int getTraceLevel() const + int getTraceLevel() const { return _traceLevel; } diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index 84c24da3e03..c59eebecbab 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -300,7 +300,7 @@ checkChar(const string& s, string::size_type pos) // Append codePoint as a UTF-8 sequence // void -appendUTF8(unsigned int codePoint, bool inBMP, string& result) +appendUTF8(unsigned int codePoint, string& result) { if(codePoint >= 0xD800 && codePoint <= 0xDFFF) { @@ -458,7 +458,7 @@ decodeChar(const string& s, string::size_type start, string::size_type end, stri "Invalid universal character name: too few hex digits"); } - appendUTF8(codePoint, inBMP, result); + appendUTF8(codePoint, result); if(codePoint > 127) { pureASCII = false; |