summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/CommunicatorI.h
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2009-07-09 14:49:06 +0200
committerJose <jose@zeroc.com>2009-07-09 14:49:06 +0200
commit9a269fd25f9fd0122092df49703c572168241ffa (patch)
tree8924a059efcf3617d9c8051fdf435a4b39e08a20 /cpp/src/Ice/CommunicatorI.h
parentfixing VC++ compilation error in StringUtil.cpp (diff)
downloadice-9a269fd25f9fd0122092df49703c572168241ffa.tar.bz2
ice-9a269fd25f9fd0122092df49703c572168241ffa.tar.xz
ice-9a269fd25f9fd0122092df49703c572168241ffa.zip
Revert 3965 - new version of Ice::initialize.
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.h')
-rw-r--r--cpp/src/Ice/CommunicatorI.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index d78693ad207..f80939fc805 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -66,7 +66,7 @@ public:
private:
- CommunicatorI(const InitializationData&, char** argv = 0);
+ CommunicatorI(const InitializationData&);
virtual ~CommunicatorI();
//
@@ -75,8 +75,7 @@ private:
//
void finishSetup(int&, char*[]);
- friend ICE_API CommunicatorPtr initialize(int&, char**&, const InitializationData&, Int);
- friend ICE_API CommunicatorPtr initialize(int, const char*[], int&, char**&, const InitializationData&, Int);
+ friend ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData&, Int);
friend ICE_API CommunicatorPtr initialize(StringSeq&, const InitializationData&, Int);
friend ICE_API CommunicatorPtr initialize(const InitializationData&, Int);
friend ICE_API ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&);
@@ -88,8 +87,6 @@ private:
// Communicator's destructor is invoked.
//
const ::IceInternal::DynamicLibraryListPtr _dynamicLibraryList;
-
- char** _argv;
};
}