diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-25 13:16:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-25 13:16:48 -0400 |
| commit | 2dc8468a233944dd1ed798d8d2cfbaa87f7c4059 (patch) | |
| tree | de77f56fd0a119680b7f22f116afa7498f445c50 /cpp/src/Ice/Initialize.cpp | |
| parent | Cache compiler version in test scripts (diff) | |
| download | ice-2dc8468a233944dd1ed798d8d2cfbaa87f7c4059.tar.bz2 ice-2dc8468a233944dd1ed798d8d2cfbaa87f7c4059.tar.xz ice-2dc8468a233944dd1ed798d8d2cfbaa87f7c4059.zip | |
Fix for VS2015 run-time error
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 3180cb367c6..9c89b83488e 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -398,6 +398,10 @@ Ice::registerPluginFactory(const std::string& name, PluginFactory factory, bool // CommunicatorHolder // +Ice::CommunicatorHolder::CommunicatorHolder() +{ +} + #ifdef ICE_CPP11_MAPPING Ice::CommunicatorHolder::CommunicatorHolder(shared_ptr<Communicator> communicator) : _communicator(std::move(communicator)) @@ -428,10 +432,6 @@ Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) #else // C++98 mapping -Ice::CommunicatorHolder::CommunicatorHolder() -{ -} - Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const char* argv[], const InitializationData& initData, int version) : _communicator(initialize(argc, argv, initData, version)) |