diff options
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/ACE.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/ACE.h | 12 | ||||
| -rw-r--r-- | ACE/ace/Version.h | 1 | ||||
| -rw-r--r-- | ACE/ace/Versioned_Namespace.h | 6 | ||||
| -rwxr-xr-x | ACE/bin/make_release.py | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 14 | ||||
| -rw-r--r-- | ACE/tests/Basic_Types_Test.cpp | 2 | ||||
| -rw-r--r-- | ACE/tests/OS_Test.cpp | 2 |
8 files changed, 29 insertions, 15 deletions
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index aec36b937ec..73282bceae7 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -108,6 +108,12 @@ ACE::beta_version (void) return ACE_BETA_VERSION; } +u_int +ACE::micro_version (void) +{ + return ACE_MICRO_VERSION; +} + const ACE_TCHAR * ACE::compiler_name (void) { diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index c9ccd7352ef..4f65a0cd0b0 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -54,14 +54,18 @@ class ACE_Handle_Set; namespace ACE { // = ACE version information. - /// e.g., the "5" in ACE 5.1.12. + /// e.g., the "6" in ACE 6.3.4 extern ACE_Export u_int major_version (void); - /// e.g., the "1" in ACE 5.1.12. + /// e.g., the "3" in ACE 6.3.4 extern ACE_Export u_int minor_version (void); - /// e.g., the "12" in ACE 5.1.12. - /// Returns 0 for "stable" (non-beta) releases. + /// e.g., the "4" in ACE 6.3.4 + /// Returns 0 for "stable" (non-micro) releases. + extern ACE_Export u_int micro_version (void); + + /// e.g., the "4" in ACE 6.3.4 + /// Returns 0 for "stable" (non-micro) releases. extern ACE_Export u_int beta_version (void); // = C++ compiler version information. diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 2bb2d9b7889..1a428baa434 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,6 +4,7 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 3 +#define ACE_MICRO_VERSION 4 #define ACE_BETA_VERSION 4 #define ACE_VERSION "6.3.4" #define ACE_VERSION_CODE 393988 diff --git a/ACE/ace/Versioned_Namespace.h b/ACE/ace/Versioned_Namespace.h index 9e3274ed9fd..cd1e68ba752 100644 --- a/ACE/ace/Versioned_Namespace.h +++ b/ACE/ace/Versioned_Namespace.h @@ -29,9 +29,9 @@ // concatenated. Force the preprocessor to expand them during the // argument prescan by calling a macro that itself calls another that // performs the actual concatenation. -# define ACE_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) ACE_ ## MAJOR ## _ ## MINOR ## _ ## BETA -# define ACE_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,BETA) ACE_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) -# define ACE_VERSIONED_NAMESPACE_NAME ACE_MAKE_VERSIONED_NAMESPACE_NAME(ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION) +# define ACE_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,MICRO) ACE_ ## MAJOR ## _ ## MINOR ## _ ## MICRO +# define ACE_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,MICRO) ACE_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,MICRO) +# define ACE_VERSIONED_NAMESPACE_NAME ACE_MAKE_VERSIONED_NAMESPACE_NAME(ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION) # endif /* !ACE_VERSIONED_NAMESPACE_NAME */ # define ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_VERSIONED_NAMESPACE_NAME { diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 4ca54f170ec..e33786a985c 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -236,6 +236,7 @@ def update_version_files (component): #define %s_MAJOR_VERSION %s #define %s_MINOR_VERSION %s +#define %s_MICRO_VERSION %s #define %s_BETA_VERSION %s #define %s_VERSION \"%s\" #define %s_VERSION_CODE %s diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index b469875e6e8..19368f4cd86 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -1,7 +1,7 @@ # -*- Makefile -*- #---------------------------------------------------------------------------- -# +# #---------------------------------------------------------------------------- # # ACE supports the following flags. They can be enabled either on @@ -78,10 +78,10 @@ # If versioned_so is 1 (enabled), the SOVERSION make # variable can also be set to specify the version info # to append to the name - it should have a leading '.' - -# else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_BETA. If 2, +# else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_MICRO. If 2, # the version will be appended to the name but *before* the # $(SOEXT) - it should have a lead '-' - else it defaults to -# -ACE_MAJOR.ACE_MINOR.ACE_BETA. +# -ACE_MAJOR.ACE_MINOR.ACE_MICRO. # wfmo Build with wfmo support (Win32 only) # winregistry Build with windows registry support (Win32 only) # winnt Build WinNT-specific projects (Win32 only) @@ -198,14 +198,16 @@ endif # static_libs ifeq (cmd,$(findstring cmd,$(SHELL))) ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) - ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) + ACE_MICRO_VERSION := $(shell awk "/ACE_MICRO_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) + ACE_BETA_VERSION := $(shell awk "/ACE_MICRO_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) else ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) - ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) + ACE_MICRO_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) + ACE_BETA_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) endif -ACE_VERSION = $(ACE_MAJOR_VERSION).$(ACE_MINOR_VERSION).$(ACE_BETA_VERSION) +ACE_VERSION = $(ACE_MAJOR_VERSION).$(ACE_MINOR_VERSION).$(ACE_MICRO_VERSION) # Define some variables to silence warnings SHR_FILTER ?= diff --git a/ACE/tests/Basic_Types_Test.cpp b/ACE/tests/Basic_Types_Test.cpp index 667931e40da..1f312944ea0 100644 --- a/ACE/tests/Basic_Types_Test.cpp +++ b/ACE/tests/Basic_Types_Test.cpp @@ -58,7 +58,7 @@ run_main (int, ACE_TCHAR *[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"), ACE_MAJOR_VERSION, ACE_MINOR_VERSION, - ACE_BETA_VERSION)); + ACE_MICRO_VERSION)); u_int errors = 0; diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 789610fddba..ebe9b47eaae 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -702,7 +702,7 @@ version_test (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing version macros\n"))); - int code = ACE_MAKE_VERSION_CODE(ACE_MAJOR_VERSION, ACE_MINOR_VERSION, ACE_BETA_VERSION); + int code = ACE_MAKE_VERSION_CODE(ACE_MAJOR_VERSION, ACE_MINOR_VERSION, ACE_MICRO_VERSION); bool run_time_check = code == ACE_VERSION_CODE; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE release time version code: %d, runtime version code: %d, %s\n"), ACE_VERSION_CODE, code, run_time_check ? ACE_TEXT ("OK") : ACE_TEXT ("FAIL"))); |