diff options
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/all.dsw | 3 | ||||
-rw-r--r-- | cpp/src/Ice/TraceLevels.cpp | 4 | ||||
-rw-r--r-- | cpp/src/IcePatch/Client.cpp | 3 | ||||
-rw-r--r-- | cpp/src/IcePatch/Server.cpp | 3 | ||||
-rw-r--r-- | cpp/src/IceStorm/TraceLevels.cpp | 4 |
5 files changed, 17 insertions, 0 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw index a1d346137be..01aa5bdf066 100644 --- a/cpp/all.dsw +++ b/cpp/all.dsw @@ -233,6 +233,9 @@ Package=<4> Begin Project Dependency
Project_Dep_Name IceUtil
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Glacier
+ End Project Dependency
}}}
###############################################################################
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp index d636cec2135..511efc8afe3 100644 --- a/cpp/src/Ice/TraceLevels.cpp +++ b/cpp/src/Ice/TraceLevels.cpp @@ -19,9 +19,13 @@ void IceInternal::incRef(TraceLevels* p) { p->__incRef(); } void IceInternal::decRef(TraceLevels* p) { p->__decRef(); } IceInternal::TraceLevels::TraceLevels(const PropertiesPtr& properties) : + network(0), networkCat("Network"), + protocol(0), protocolCat("Protocol"), + retry(0), retryCat("Retry"), + security(0), securityCat("Security") { const string keyBase = "Ice.Trace."; diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp index e75fdf1cfff..3fb8b6d4d5f 100644 --- a/cpp/src/IcePatch/Client.cpp +++ b/cpp/src/IcePatch/Client.cpp @@ -17,6 +17,9 @@ #include <Ice/System.h> #include <Ice/SslExtension.h> #include <iomanip> +#ifdef _WIN32 +# include <direct.h> +#endif using namespace std; using namespace Ice; diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp index 3f90275cfa4..a84c71a1476 100644 --- a/cpp/src/IcePatch/Server.cpp +++ b/cpp/src/IcePatch/Server.cpp @@ -11,6 +11,9 @@ #include <Ice/Application.h> #include <IcePatch/FileLocator.h> #include <IcePatch/Util.h> +#ifdef _WIN32 +# include <direct.h> +#endif using namespace std; using namespace Ice; diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp index c16c0aaa6e3..46557fc5a45 100644 --- a/cpp/src/IceStorm/TraceLevels.cpp +++ b/cpp/src/IceStorm/TraceLevels.cpp @@ -15,9 +15,13 @@ using namespace std; using namespace IceStorm; TraceLevels::TraceLevels(const Ice::PropertiesPtr& properties, const Ice::LoggerPtr& theLogger) : + topicMgr(0), topicMgrCat("TopicManager"), + topic(0), topicCat("Topic"), + flush(0), flushCat("Flush"), + subscriber(0), subscriberCat("Subscriber"), logger(theLogger) { |