From 5844bc00dc1abb29c3f516f581ec241bac74b15d Mon Sep 17 00:00:00 2001 From: Michi Henning Date: Mon, 6 Oct 2003 23:26:58 +0000 Subject: Moved UserExceptionFactory from Ice to IceInternal namespace/package. --- cpp/src/slice2cpp/Gen.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'cpp/src/slice2cpp/Gen.cpp') diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 2d2031a7893..35633802f0c 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -210,6 +210,11 @@ Slice::Gen::generate(const UnitPtr& p) H << "\n#include "; } + if(p->hasNonLocalExceptions()) + { + H << "\n#include "; + } + if(p->hasDataOnlyClasses() || p->hasNonLocalExceptions()) { H << "\n#include "; @@ -399,14 +404,14 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) H.dec(); H << sp << "private:"; H.inc(); - H << sp << nl << "static ::Ice::UserExceptionFactoryPtr _factory;"; + H << sp << nl << "static ::IceInternal::UserExceptionFactoryPtr _factory;"; H << sp; H.dec(); H << sp << "public:"; H.inc(); - H << sp << nl << "static const ::Ice::UserExceptionFactoryPtr& ice_factory();"; + H << sp << nl << "static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();"; - C << sp << nl << "const ::Ice::UserExceptionFactoryPtr&"; + C << sp << nl << "const ::IceInternal::UserExceptionFactoryPtr&"; C << nl << scoped.substr(2) << "::ice_factory()"; C << sb; C << nl << "return _factory;"; @@ -472,7 +477,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) } } - C << sp << nl << "class __F__" << name << " : public ::Ice::UserExceptionFactory"; + C << sp << nl << "class __F__" << name << " : public ::IceInternal::UserExceptionFactory"; C << sb; C.dec(); C << nl << "public:"; @@ -484,7 +489,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) C << eb; C << eb << ";"; - C << sp << nl << "::Ice::UserExceptionFactoryPtr " << scoped.substr(2) << "::_factory = new __F__" + C << sp << nl << "::IceInternal::UserExceptionFactoryPtr " << scoped.substr(2) << "::_factory = new __F__" << name << ";"; C << sp << nl << "class __F__" << name << "__Init"; -- cgit v1.2.3