diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/templates.xml | 4 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 6 | ||||
| -rw-r--r-- | cpp/include/IceUtil/ResourceConfig.h | 6 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS | 8 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS | 2 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index a50b4f932d8..a98061b03dc 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -28,7 +28,7 @@ <parameter name="publish-endpoints" default="default"/> <parameter name="flush-timeout" default="1000"/> - <service name="${instance-name}" entry="IceStormService,37b1:createIceStorm"> + <service name="${instance-name}" entry="IceStormService,37b2:createIceStorm"> <adapter name="${service}.TopicManager" id="${instance-name}.TopicManager" @@ -75,7 +75,7 @@ <parameter name="publish-replica-group"/> <parameter name="topic-manager-replica-group"/> - <service name="${instance-name}${node-id}" entry="IceStormService,37b1:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,37b2:createIceStorm"> <adapter name="${service}.TopicManager" id="${instance-name}${node-id}.TopicManager" diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index f12da0ece4a..f4f1ded5e17 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -275,9 +275,9 @@ // // The Ice version. // -#define ICE_STRING_VERSION "3.7b1" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30761 // AABBCC, with AA=major, BB=minor, CC=patch -#define ICE_SO_VERSION "37b1" // "ABC", with A=major, B=minor, C=patch +#define ICE_STRING_VERSION "3.7b2" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30762 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_SO_VERSION "37b2" // "ABC", with A=major, B=minor, C=patch #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS) # define ICE_BUILDING_ICE diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h index e446105a345..420a2dba6f3 100644 --- a/cpp/include/IceUtil/ResourceConfig.h +++ b/cpp/include/IceUtil/ResourceConfig.h @@ -7,9 +7,9 @@ #include "winver.h" -#define ICE_VERSION 3,7,61,0 -#define ICE_STRING_VERSION "3.7b1\0" -#define ICE_SO_VERSION "37b1\0" +#define ICE_VERSION 3,7,62,0 +#define ICE_STRING_VERSION "3.7b2\0" +#define ICE_SO_VERSION "37b2\0" #define ICE_COMPANY_NAME "ZeroC, Inc.\0" #define ICE_COPYRIGHT "\251 ZeroC, Inc.\0" #define ICE_PRODUCT_NAME "Ice\0" diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS index 0cba425ebe5..56aad941676 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS @@ -1,7 +1,7 @@ - 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7b1.dylib - 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7b1.dylib - 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib - 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib + 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7b2.dylib + 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7b2.dylib + 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib + 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib 4 (anonymous namespace)::Thrower::fifth() in client 5 (anonymous namespace)::Thrower::forth() in client 6 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS index cf223bb842d..72ba6b5f005 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS @@ -1,4 +1,4 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib 1 (anonymous namespace)::Thrower::fifth() in client 2 (anonymous namespace)::Thrower::forth() in client 3 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS index 282221ff313..8ce1c4f6e76 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS @@ -1,3 +1,3 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib 1 Client::run(int, char**) in client 2 int Test::runTest<Client>(int, char**) in client |