diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-12 10:35:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-12 10:35:04 +0200 |
| commit | 1e5843ba8400c617997e81735a9f84ac2e12bb0a (patch) | |
| tree | ac82b96476e9c161d5a2b91bfc14ec8224d823ec /cpp/test/Ice/inheritance/Collocated.cpp | |
| parent | ICE-6163 - Improve error handling in test scripts (diff) | |
| download | ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.tar.bz2 ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.tar.xz ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.zip | |
Fixed ICE-6671 - Added registration functions to explicitly register Ice plugins
Diffstat (limited to 'cpp/test/Ice/inheritance/Collocated.cpp')
| -rw-r--r-- | cpp/test/Ice/inheritance/Collocated.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index aa3065f4dc3..4948c224464 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -23,27 +23,18 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); - + InitialPrx allTests(const Ice::CommunicatorPtr&); allTests(communicator); return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; |