diff options
-rw-r--r-- | cpp/src/Ice/LocatorInfo.cpp | 4 | ||||
-rw-r--r-- | cpp/src/Slice/FileTracker.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index a2cc09ff1af..4271e3ceaab 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -34,7 +34,7 @@ class ObjectRequest : public LocatorInfo::Request, public Ice::AMI_Locator_findO { public: - ObjectRequest(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) : Request(locatorInfo, ref) + ObjectRequest(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) : LocatorInfo::Request(locatorInfo, ref) { assert(ref->isWellKnown()); } @@ -73,7 +73,7 @@ class AdapterRequest : public LocatorInfo::Request, public Ice::AMI_Locator_find { public: - AdapterRequest(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) : Request(locatorInfo, ref) + AdapterRequest(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) : LocatorInfo::Request(locatorInfo, ref) { assert(ref->isIndirect() && !ref->isWellKnown()); } diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index 438670cf2f8..43d9632ad17 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -16,7 +16,7 @@ using namespace std; Slice::FileException::FileException(const char* file, int line, const string& r) : - Exception(file, line), + IceUtil::Exception(file, line), _reason(r) { } @@ -36,7 +36,7 @@ Slice::FileException::ice_name() const void Slice::FileException::ice_print(ostream& out) const { - Exception::ice_print(out); + IceUtil::Exception::ice_print(out); out << ": " << _reason; } |