diff options
31 files changed, 44 insertions, 11 deletions
diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h index d6986fef918..fc312a3740f 100644 --- a/cpp/include/Ice/Direct.h +++ b/cpp/include/Ice/Direct.h @@ -16,6 +16,8 @@ #include <Ice/LocalObjectF.h> #include <Ice/Current.h> +#include <memory> + namespace IceInternal { diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index 33b2ff2db28..576a4e33d9d 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -18,6 +18,7 @@ #include <Ice/ReferenceF.h> #include <Ice/BasicStream.h> #include <Ice/Current.h> +#include <memory> namespace Ice { diff --git a/cpp/src/FreezeScript/AssignVisitor.cpp b/cpp/src/FreezeScript/AssignVisitor.cpp index 5216cda19d4..1cb3f6be806 100644 --- a/cpp/src/FreezeScript/AssignVisitor.cpp +++ b/cpp/src/FreezeScript/AssignVisitor.cpp @@ -9,6 +9,7 @@ #include <FreezeScript/AssignVisitor.h> #include <FreezeScript/Util.h> +#include <climits> using namespace std; diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp index da3f6991ab5..5dd87b8a343 100644 --- a/cpp/src/FreezeScript/Data.cpp +++ b/cpp/src/FreezeScript/Data.cpp @@ -12,6 +12,7 @@ #include <FreezeScript/Util.h> #include <FreezeScript/Exception.h> #include <IceUtil/InputUtil.h> +#include <climits> using namespace std; using namespace IceUtil; diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp index 8521185ac49..98f95eff7ff 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.cpp +++ b/cpp/src/FreezeScript/DumpDescriptors.cpp @@ -16,6 +16,7 @@ #include <IceUtil/InputUtil.h> #include <db_cxx.h> #include <set> +#include <climits> using namespace std; diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp index a36b88466f0..db692c8d865 100644 --- a/cpp/src/FreezeScript/Transformer.cpp +++ b/cpp/src/FreezeScript/Transformer.cpp @@ -20,6 +20,7 @@ #include <IceXML/Parser.h> #include <IceUtil/InputUtil.h> #include <db_cxx.h> +#include <climits> using namespace std; diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index ca258c034c5..e917ddbdd83 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -19,6 +19,7 @@ #include <Ice/ProxyF.h> #include <Ice/BasicStream.h> +#include <memory> #include <deque> namespace IceInternal diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 82233a4a135..0511226c60d 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -29,6 +29,7 @@ #include <Ice/SelectorThread.h> #include <deque> +#include <memory> namespace IceInternal { diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 230847c56f9..1ce7135e15b 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -22,6 +22,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <climits> #ifndef _WIN32 # include <sys/wait.h> diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index f674194e00a..d8f6c6c0cd4 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -17,6 +17,7 @@ #include <IceGrid/TraceLevels.h> #include <IcePatch2/Util.h> +#include <climits> #if defined(_WIN32) # include <direct.h> // For _getcwd diff --git a/cpp/src/IcePatch2/OS.cpp b/cpp/src/IcePatch2/OS.cpp index 9524f10e154..8b00df9061a 100644 --- a/cpp/src/IcePatch2/OS.cpp +++ b/cpp/src/IcePatch2/OS.cpp @@ -10,6 +10,7 @@ #include <IceUtil/DisableWarnings.h> #include <OS.h> #include <IceUtil/Unicode.h> +#include <climits> #ifdef __BCPLUSPLUS__ # include <dir.h> diff --git a/cpp/src/IceUtil/ArgVector.cpp b/cpp/src/IceUtil/ArgVector.cpp index 98da22eb6a2..a9f01088b6e 100644 --- a/cpp/src/IceUtil/ArgVector.cpp +++ b/cpp/src/IceUtil/ArgVector.cpp @@ -9,6 +9,7 @@ #include <IceUtil/ArgVector.h> #include <IceUtil/DisableWarnings.h> +#include <cstring> IceUtilInternal::ArgVector::ArgVector(int argc, char *argv[]) { diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index 12d8f238e46..89e1f349952 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <IceUtil/OutputUtil.h> +#include <cstring> using namespace std; using namespace IceUtil; diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index e087e5586dc..99c4d759724 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -9,6 +9,7 @@ #include <IceUtil/StringUtil.h> #include <IceUtil/Unicode.h> +#include <cstring> using namespace std; using namespace IceUtil; diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp index 64081317ff0..55ae4847328 100644 --- a/cpp/src/IceUtil/Thread.cpp +++ b/cpp/src/IceUtil/Thread.cpp @@ -7,18 +7,19 @@ // // ********************************************************************** -#ifdef __sun // +#ifdef __sun +// // Solaris 10 bug: it's supposed to be defined in pthread.h // #ifndef __EXTENSIONS__ #define __EXTENSIONS__ #endif -#include <limits.h> #endif #include <IceUtil/Thread.h> #include <IceUtil/Time.h> #include <IceUtil/ThreadException.h> +#include <climits> using namespace std; diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index dab0be36857..a7b24bda2cf 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -9,6 +9,7 @@ #include <Slice/CPlusPlusUtil.h> #include <Slice/Util.h> +#include <cstring> using namespace std; using namespace Slice; diff --git a/cpp/src/Slice/DotNetNames.cpp b/cpp/src/Slice/DotNetNames.cpp index 689949a0234..cd3b3187f47 100755 --- a/cpp/src/Slice/DotNetNames.cpp +++ b/cpp/src/Slice/DotNetNames.cpp @@ -9,6 +9,7 @@ #include <Slice/DotNetNames.h> #include <ctype.h> +#include <cstring> using namespace std; diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 2cb679d48f7..61725fa43b8 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -11,6 +11,7 @@ #include <Slice/GrammarUtil.h> #include <IceUtil/UUID.h> +#include <cstring> #ifdef _MSC_VER // I get these warnings from some bison versions: diff --git a/cpp/src/Slice/MD5.cpp b/cpp/src/Slice/MD5.cpp index d98cc6c99ac..f161f4947dd 100644 --- a/cpp/src/Slice/MD5.cpp +++ b/cpp/src/Slice/MD5.cpp @@ -9,6 +9,7 @@ #include <Slice/MD5.h> #include <Slice/MD5I.h> +#include <cstring> using namespace std; diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 2557a048c1b..15488c54786 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -14,6 +14,7 @@ #include <Slice/Parser.h> #include <Slice/GrammarUtil.h> #include <Slice/Util.h> +#include <cstring> #ifdef __BCPLUSPLUS__ # include <iterator> #endif diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 869dc5ca760..2a26aa026af 100755 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -18,6 +18,7 @@ #include <fstream> #include <sys/types.h> #include <sys/stat.h> +#include <cstring> #ifndef _WIN32 # include <sys/wait.h> @@ -113,7 +114,7 @@ Slice::Preprocessor::normalizeIncludePath(const string& path) result.replace(pos, 2, "/"); } - if(result == "/" || result.size() == 3 && isalpha(result[0]) && result[1] == ':' && result[2] == '/') + if(result == "/" || (result.size() == 3 && isalpha(result[0]) && result[1] == ':' && result[2] == '/')) { return result; } @@ -144,11 +145,11 @@ Slice::Preprocessor::preprocess(bool keepComments) } args.push_back(_fileName); - char** argv = new char*[args.size() + 1]; + const char** argv = new const char*[args.size() + 1]; argv[0] = "mcpp"; for(unsigned int i = 0; i < args.size(); ++i) { - argv[i + 1] = (char*) args[i].c_str(); + argv[i + 1] = args[i].c_str(); } // @@ -166,7 +167,7 @@ Slice::Preprocessor::preprocess(bool keepComments) // Call mcpp using memory buffer. // mcpp_use_mem_buffers(1); - mcpp_lib_main(static_cast<int>(args.size()) + 1, argv); + mcpp_lib_main(static_cast<int>(args.size()) + 1, const_cast<char**>(argv)); delete[] argv; // @@ -226,17 +227,17 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin args.push_back("-M"); args.push_back(_fileName); - char** argv = new char*[args.size() + 1]; + const char** argv = new const char*[args.size() + 1]; for(unsigned int i = 0; i < args.size(); ++i) { - argv[i + 1] = (char*) args[i].c_str(); + argv[i + 1] = args[i].c_str(); } // // Call mcpp using memory buffer. // mcpp_use_mem_buffers(1); - mcpp_lib_main(static_cast<int>(args.size() + 1), argv); + mcpp_lib_main(static_cast<int>(args.size() + 1), const_cast<char**>(argv)); delete[] argv; // diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 517fabbbdf5..62babf9f670 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -13,6 +13,7 @@ #include <IceUtil/IceUtil.h> #include <IceUtil/StringUtil.h> #include <IceUtil/InputUtil.h> +#include <climits> #ifdef __BCPLUSPLUS__ # include <iterator> #endif diff --git a/cpp/src/Slice/SignalHandler.cpp b/cpp/src/Slice/SignalHandler.cpp index e869962c48b..103b82ecad0 100644 --- a/cpp/src/Slice/SignalHandler.cpp +++ b/cpp/src/Slice/SignalHandler.cpp @@ -10,6 +10,7 @@ #include <IceUtil/DisableWarnings.h> #include <Slice/SignalHandler.h> #include <vector> +#include <cstdlib> #ifndef _WIN32 # include <signal.h> diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index 4541b833413..663a0ef952a 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -9,6 +9,7 @@ #include <Slice/Util.h> #include <IceUtil/Unicode.h> +#include <climits> #ifdef __hpux # include <unistd.h> diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 1da321e4e62..e4971e68b24 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -2156,7 +2156,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) _out << eb; } - if(!base || base && !base->usesClasses()) + if(!base || (base && !base->usesClasses())) { _out << sp << nl << "public override bool usesClasses__()"; _out << sb; @@ -4632,6 +4632,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) string param = fixId(q->second); StructPtr st = StructPtr::dynamicCast(q->first); if(st) + { if(isValueType(st)) { _out << nl << param << " = new " << typeToString(q->first) << "();"; @@ -4640,6 +4641,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) { _out << nl << param << " = null;"; } + } writeMarshalUnmarshalCode(_out, q->first, fixId(q->second), false, false, true); } if(ret) diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp index b4d156972c8..f8950f72d46 100644 --- a/cpp/src/slice2docbook/Gen.cpp +++ b/cpp/src/slice2docbook/Gen.cpp @@ -11,6 +11,7 @@ #include <IceUtil/Functional.h> #include <Slice/SignalHandler.h> #include <Gen.h> +#include <cstring> #ifdef __BCPLUSPLUS__ # include <iterator> diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 9e84263f009..f7b6c692971 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -13,6 +13,7 @@ #include <Slice/CPlusPlusUtil.h> #include <IceUtil/OutputUtil.h> #include <Slice/SignalHandler.h> +#include <cstring> using namespace std; using namespace IceUtil; diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index dd6228da4f7..2a01023162a 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -12,6 +12,7 @@ #include <Slice/Checksum.h> #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> +#include <cstring> #include <limits> @@ -2264,7 +2265,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) if(p->usesClasses()) { - if(!base || base && !base->usesClasses()) + if(!base || (base && !base->usesClasses())) { out << sp << nl << "public boolean" << nl << "__usesClasses()"; out << sb; diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp index f54d0ccf9c8..59f91cb361d 100644 --- a/cpp/src/slice2javae/Gen.cpp +++ b/cpp/src/slice2javae/Gen.cpp @@ -11,6 +11,7 @@ #include <Gen.h> #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> +#include <cstring> #include <limits> diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp index d82fc5b4bf7..226ebea9c86 100644 --- a/cpp/src/slice2py/Main.cpp +++ b/cpp/src/slice2py/Main.cpp @@ -14,6 +14,7 @@ #include <Slice/Preprocessor.h> #include <Slice/PythonUtil.h> #include <Slice/SignalHandler.h> +#include <cstring> #include <fstream> diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h index 0ae5e00c27b..586c439a845 100644 --- a/cpp/test/Ice/background/Configuration.h +++ b/cpp/test/Ice/background/Configuration.h @@ -15,6 +15,7 @@ #include <Ice/LocalException.h> #include <Ice/Selector.h> +#include <memory> class Configuration; typedef IceUtil::Handle<Configuration> ConfigurationPtr; |