diff options
Diffstat (limited to 'cpp/src/IceUtil')
-rw-r--r-- | cpp/src/IceUtil/ConvertUTF.cpp | 2 | ||||
-rw-r--r-- | cpp/src/IceUtil/ConvertUTF.h | 3 | ||||
-rw-r--r-- | cpp/src/IceUtil/CtrlCHandler.cpp | 1 | ||||
-rw-r--r-- | cpp/src/IceUtil/OutputUtil.cpp | 1 | ||||
-rw-r--r-- | cpp/src/IceUtil/StringConverter.cpp | 3 | ||||
-rw-r--r-- | cpp/src/IceUtil/StringUtil.cpp | 1 | ||||
-rw-r--r-- | cpp/src/IceUtil/ThreadException.cpp | 3 | ||||
-rw-r--r-- | cpp/src/IceUtil/Unicode.cpp | 1 | ||||
-rw-r--r-- | cpp/src/IceUtil/Unicode.h | 1 | ||||
-rw-r--r-- | cpp/src/IceUtil/UtilException.cpp | 6 |
10 files changed, 0 insertions, 22 deletions
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp index f2e5d37b7e3..c8501dac76e 100644 --- a/cpp/src/IceUtil/ConvertUTF.cpp +++ b/cpp/src/IceUtil/ConvertUTF.cpp @@ -83,7 +83,6 @@ const UTF32 halfMask = 0x3FFUL; // #define false 0 // #define true 1 - /* --------------------------------------------------------------------- */ /* @@ -446,7 +445,6 @@ ConversionResult ConvertUTF8toUTF32 ( --------------------------------------------------------------------- */ - /* --------------------------------------------------------------------- */ /* diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index aa7928c7a70..ba6016861d1 100644 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -91,7 +91,6 @@ ------------------------------------------------------------------------ */ - namespace IceUtilInternal { @@ -109,7 +108,6 @@ enum ConversionResult sourceIllegal /* source sequence is illegal/malformed */ }; - /* --------------------------------------------------------------------- The following 4 definitions are compiler-specific. The C standard does not guarantee that wchar_t has at least @@ -130,7 +128,6 @@ typedef bool Boolean; /* 0 or 1 */ #define UNI_MAX_UTF32 static_cast<UTF32>(0x7FFFFFFF) #define UNI_MAX_LEGAL_UTF32 static_cast<UTF32>(0x0010FFFF) - ConversionResult ConvertUTF8toUTF16( const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index a7900cfa0b9..79c52ea0a69 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -106,7 +106,6 @@ static BOOL WINAPI handlerRoutine(DWORD dwCtrlType) return TRUE; } - CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index e7e0d043f4f..0af818ab534 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -71,7 +71,6 @@ IceUtilInternal::OutputBase::OutputBase(ostream& os) : { } - IceUtilInternal::OutputBase::OutputBase(const string& s) : _out(_fout), _pos(0), diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp index 246c25b54e9..8949577b611 100644 --- a/cpp/src/IceUtil/StringConverter.cpp +++ b/cpp/src/IceUtil/StringConverter.cpp @@ -259,7 +259,6 @@ public: Init init; - const WstringConverterPtr& getUnicodeWstringConverter() { @@ -458,7 +457,6 @@ typedef char32_t Char32T; #endif - vector<unsigned short> IceUtilInternal::toUTF16(const vector<Byte>& source) { @@ -526,7 +524,6 @@ IceUtilInternal::toUTF32(const vector<Byte>& source) return result; } - vector<Byte> IceUtilInternal::fromUTF32(const vector<unsigned int>& source) { diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index a5c8f15a5d7..b69f247c0e5 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -33,7 +33,6 @@ toHexDigit(Byte b) } } - unsigned int addContinuationByte(string::iterator& p, string::iterator end, unsigned int codePoint) { diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp index 769cd264d3d..8d681fe108b 100644 --- a/cpp/src/IceUtil/ThreadException.cpp +++ b/cpp/src/IceUtil/ThreadException.cpp @@ -49,7 +49,6 @@ IceUtil::ThreadLockedException::ice_clone() const } #endif - IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int line) : ExceptionHelper<ThreadStartedException>(file, line) { @@ -80,7 +79,6 @@ IceUtil::ThreadNotStartedException::ice_id() const return "::IceUtil::ThreadNotStartedException"; } - #ifndef ICE_CPP11_MAPPING IceUtil::ThreadNotStartedException* IceUtil::ThreadNotStartedException::ice_clone() const @@ -89,7 +87,6 @@ IceUtil::ThreadNotStartedException::ice_clone() const } #endif - IceUtil::BadThreadControlException::BadThreadControlException(const char* file, int line) : ExceptionHelper<BadThreadControlException>(file, line) { diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp index a82fc3b772c..4c5914a2c51 100644 --- a/cpp/src/IceUtil/Unicode.cpp +++ b/cpp/src/IceUtil/Unicode.cpp @@ -32,7 +32,6 @@ namespace // template<size_t wcharSize> struct WstringHelper; - template<> struct WstringHelper<2> { diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h index a6d6d5d2a2b..cc963b8f4da 100644 --- a/cpp/src/IceUtil/Unicode.h +++ b/cpp/src/IceUtil/Unicode.h @@ -30,7 +30,6 @@ bool convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd, IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd); - void convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd, std::wstring& target); diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 3a51e5824d7..3c85b32ed53 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -297,7 +297,6 @@ handlePcInfoError(void* data, const char* msg, int errnum) frameInfo.setByErrorCb = true; } - int addFrame(void* sf, uintptr_t pc) { @@ -353,7 +352,6 @@ getStackFrames() return stackFrames; } - string getStackTrace(const vector<void*>& stackFrames) { @@ -626,7 +624,6 @@ IceUtil::NullHandleException::ice_clone() const } #endif - IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, int line) : ExceptionHelper<IllegalArgumentException>(file, line) { @@ -720,8 +717,6 @@ IceUtil::IllegalConversionException::reason() const return _reason; } - - IceUtil::SyscallException::SyscallException(const char* file, int line, int err ): ExceptionHelper<SyscallException>(file, line), _error(err) @@ -764,7 +759,6 @@ IceUtil::SyscallException::error() const return _error; } - IceUtil::FileLockException::FileLockException(const char* file, int line, int err, const string& path): ExceptionHelper<FileLockException>(file, line), _error(err), |