summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Instance.cpp6
-rw-r--r--cpp/src/Ice/Instance.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 72ce02592cd..30496967304 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -264,7 +264,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc,
// Convert command-line options beginning with --Ice. to properties.
//
StringSeq args = argsToStringSeq(argc, argv);
- args = properties->parseCommandLineOptions("Ice", args);
+ args = _properties->parseCommandLineOptions("Ice", args);
stringSeqToArgs(args, argc, argv);
try
@@ -352,9 +352,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc,
_stats = 0; // There is no default statistics callback object.
- _traceLevels = new TraceLevels(_properties);
+ const_cast<TraceLevelsPtr&>(_traceLevels) = new TraceLevels(_properties);
- _defaultsAndOverrides = new DefaultsAndOverrides(_properties);
+ const_cast<DefaultsAndOverridesPtr&>(_defaultsAndOverrides) = new DefaultsAndOverrides(_properties);
_routerManager = new RouterManager;
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 334d3ad7dff..631cd45253e 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -85,11 +85,11 @@ private:
friend class Ice::CommunicatorI;
bool _destroyed;
- Ice::PropertiesPtr _properties; // Immutable, not reset by destroy().
+ const Ice::PropertiesPtr _properties; // Immutable, not reset by destroy().
Ice::LoggerPtr _logger; // Not reset by destroy().
Ice::StatsPtr _stats; // Not reset by destroy().
- TraceLevelsPtr _traceLevels; // Immutable, not reset by destroy().
- DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy().
+ const TraceLevelsPtr _traceLevels; // Immutable, not reset by destroy().
+ const DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy().
RouterManagerPtr _routerManager;
LocatorManagerPtr _locatorManager;
ReferenceFactoryPtr _referenceFactory;