diff options
| author | Jose <jose@zeroc.com> | 2018-02-08 17:23:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-02-08 17:23:26 +0100 |
| commit | 41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c (patch) | |
| tree | 92eda1d6156d91d4bfce18f8fc06820af1e401ff /cpp/include | |
| parent | Remove old files (diff) | |
| parent | Fixed matlab check for testing (diff) | |
| download | ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.tar.bz2 ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.tar.xz ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.zip | |
Merge branch '3.7' of github.com:zeroc-ice/ice into 3.7
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Initialize.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 15964d54998..f595b126194 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -659,7 +659,7 @@ public: * Adopts the given communicator. * @param communicator The new communicator instance to hold. */ - explicit CommunicatorHolder(std::shared_ptr<Communicator> communicator); + CommunicatorHolder(std::shared_ptr<Communicator> communicator); /** * Adopts the given communicator. If this holder currently holds a communicator, @@ -869,7 +869,7 @@ public: * Adopts the given communicator. * @param communicator The new communicator instance to hold. */ - explicit CommunicatorHolder(const CommunicatorPtr& communicator); + CommunicatorHolder(const CommunicatorPtr& communicator); /** * Adopts the given communicator. If this holder currently holds a communicator, |