summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-06-12 23:37:36 +0200
committerJose <jose@zeroc.com>2019-06-12 23:37:36 +0200
commit6aa73dd58bf652035f5f676153aebab0311b11f6 (patch)
tree493497a9dca6e4f310dabeb1f29cfd9289e6c33f /cpp
parentRun swiftformat over all Swift files (diff)
downloadice-6aa73dd58bf652035f5f676153aebab0311b11f6.tar.bz2
ice-6aa73dd58bf652035f5f676153aebab0311b11f6.tar.xz
ice-6aa73dd58bf652035f5f676153aebab0311b11f6.zip
Update Version to 3.7b1
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/templates.xml4
-rw-r--r--cpp/include/IceUtil/Config.h6
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h6
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS8
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS2
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS2
6 files changed, 14 insertions, 14 deletions
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index aab103a9c67..a50b4f932d8 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,37:createIceStorm">
+ <service name="${instance-name}" entry="IceStormService,37b1: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,37:createIceStorm">
+ <service name="${instance-name}${node-id}" entry="IceStormService,37b1: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 a9969c45e57..124d0d41080 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -273,9 +273,9 @@
//
// The Ice version.
//
-#define ICE_STRING_VERSION "3.7.2" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30702 // AABBCC, with AA=major, BB=minor, CC=patch
-#define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
+#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
#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 4bf0c68d158..e446105a345 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,2,0
-#define ICE_STRING_VERSION "3.7.2\0"
-#define ICE_SO_VERSION "37\0"
+#define ICE_VERSION 3,7,61,0
+#define ICE_STRING_VERSION "3.7b1\0"
+#define ICE_SO_VERSION "37b1\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 d583b1ae244..0cba425ebe5 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.7.2.dylib
- 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.2.dylib
- 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib
- 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib
+ 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
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 42e5366de0f..cf223bb842d 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.7.2.dylib
+ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.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 54d694c8b55..282221ff313 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.7.2.dylib
+ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib
1 Client::run(int, char**) in client
2 int Test::runTest<Client>(int, char**) in client