summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ace/ACE.cpp6
-rw-r--r--ACE/ace/ACE.h12
-rw-r--r--ACE/ace/OS_NS_netdb.inl6
-rw-r--r--ACE/ace/Version.h3
-rw-r--r--ACE/ace/Versioned_Namespace.h6
-rw-r--r--ACE/ace/ace_wchar.h2
-rwxr-xr-xACE/bin/make_release.py18
-rw-r--r--ACE/include/makeinclude/wrapper_macros.GNU14
-rw-r--r--ACE/tests/Basic_Types_Test.cpp2
-rw-r--r--ACE/tests/OS_Test.cpp46
-rw-r--r--TAO/TAO_IDL/be/be_codegen.cpp2
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp2
-rw-r--r--TAO/rules.tao.GNU10
-rw-r--r--TAO/tao/Version.h3
-rw-r--r--TAO/tao/Versioned_Namespace.h6
15 files changed, 108 insertions, 30 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/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl
index 433f8cfec3f..5f4e4c258e9 100644
--- a/ACE/ace/OS_NS_netdb.inl
+++ b/ACE/ace/OS_NS_netdb.inl
@@ -785,10 +785,10 @@ ACE_OS::gai_strerror (int errcode)
default:
return ACE_TEXT ("Unknown error");
}
-#elif !defined ACE_WIN32
- return ACE_TEXT_CHAR_TO_TCHAR (::gai_strerror (errcode));
+#elif defined ACE_WIN32
+ return ACE_TEXT_gai_strerror (errcode);
#else
- return ::gai_strerror (errcode);
+ return ACE_TEXT_CHAR_TO_TCHAR (::gai_strerror (errcode));
#endif
}
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 3644fdb9f66..1a428baa434 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,5 +4,8 @@
#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
+#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
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/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 299c52980dd..dcc8f36fe8f 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -273,6 +273,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#define ACE_TEXT_PdhExpandCounterPath ::PdhExpandCounterPathW
#define ACE_TEXT_PdhOpenQuery ::PdhOpenQueryW
#define ACE_TEXT_PdhAddCounter ::PdhAddCounterW
+#define ACE_TEXT_gai_strerror ::gai_strerrorW
#else /* ACE_USES_WCHAR */
#define ACE_LPSTR LPSTR
@@ -332,6 +333,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#define ACE_TEXT_PdhExpandCounterPath ::PdhExpandCounterPathA
#define ACE_TEXT_PdhOpenQuery ::PdhOpenQueryA
#define ACE_TEXT_PdhAddCounter ::PdhAddCounterA
+#define ACE_TEXT_gai_strerror ::gai_strerrorA
#endif /* ACE_USES_WCHAR */
#endif /* ACE_WIN32 */
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index f487339197d..3962288d9a3 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -40,7 +40,8 @@ This dict contains entries of the form
COMPONENT_version
COMPONENT_beta
COMPONENT_minor
-COMPONENT_major """
+COMPONENT_major
+COMPONENT_code """
comp_versions = dict ()
old_comp_versions = dict ()
@@ -231,16 +232,22 @@ def update_version_files (component):
## Update component/component/Version.h
version_header = """
// -*- C++ -*-
-// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
+// This is file was automatically generated by $ACE_ROOT/bin/make_release.py
#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
+#define %s_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
""" % (component, comp_versions[component + "_major"],
component, comp_versions[component + "_minor"],
component, comp_versions[component + "_beta"],
- component, comp_versions[component + "_version"])
+ component, comp_versions[component + "_beta"],
+ component, comp_versions[component + "_version"],
+ component, comp_versions[component + "_code"],
+ component)
if opts.take_action:
with open (component + '/' + component.lower () + "/Version.h", 'r+') as version_h:
@@ -529,6 +536,11 @@ def get_comp_versions (component):
str (comp_versions[component + "_minor"]) + '_' + \
str (comp_versions[component + "_beta"])
+ comp_versions [component + "_code"] = \
+ str((comp_versions[component + "_major"] << 16) + \
+ (comp_versions[component + "_minor"] << 8) + \
+ comp_versions[component + "_beta"])
+
old_comp_versions [component + "_version"] = \
str (old_comp_versions[component + "_major"]) + '.' + \
str (old_comp_versions[component + "_minor"]) + '.' + \
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index b469875e6e8..9d2a25292cd 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_MICRO_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 232aee46b7c..a0485b34bc9 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -698,6 +698,31 @@ compiler_test (void)
}
static int
+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_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")));
+
+ // Compile time check. Check we have ACE version 6.x
+#if ACE_VERSION_CODE > ACE_MAKE_VERSION_CODE(5, 88, 99)
+ bool compile_time_check = true;
+#else
+ bool compile_time_check = false;
+#endif
+
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Compile time version check, %s\n"),
+ compile_time_check ? ACE_TEXT ("OK") : ACE_TEXT ("FAIL")));
+
+ if(run_time_check && compile_time_check)
+ return 0;
+ return 1;
+}
+
+static int
ctime_r_test (void)
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ctime_r\n")));
@@ -1582,11 +1607,24 @@ swab_test (void)
}
int
+gai_strerror_test (void)
+{
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("Testing gai_strerror method\n")));
+
+ const ACE_TCHAR* error_text = ACE_OS::gai_strerror (EAI_FAMILY);
+
+ ACE_UNUSED_ARG (error_text);
+
+ return 0;
+}
+
+int
run_main (int, ACE_TCHAR *[])
{
ACE_START_TEST (ACE_TEXT ("OS_Test"));
- // Enable a locale that has digit gropuing so that snprintf's %'d is
+ // Enable a locale that has digit grouping so that snprintf's %'d is
// different than %d. If the locale is not available the test won't
// fail (log file needs to be examined to check formatting).
#ifdef ACE_WIN32
@@ -1669,6 +1707,12 @@ run_main (int, ACE_TCHAR *[])
if ((result = compiler_test ()) != 0)
status = result;
+ if ((result = version_test ()) != 0)
+ status = result;
+
+ if ((result = gai_strerror_test ()) != 0)
+ status = result;
+
ACE_END_TEST;
return status;
}
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 4b0d85a873f..0903df6bbc4 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -327,7 +327,7 @@ TAO_CodeGen::start_client_header (const char *fname)
// Generate the regeneration check.
*this->client_header_ << "\n\n#if TAO_MAJOR_VERSION != " << TAO_MAJOR_VERSION
<< " || TAO_MINOR_VERSION != " << TAO_MINOR_VERSION
- << " || TAO_BETA_VERSION != " << TAO_BETA_VERSION
+ << " || TAO_MICRO_VERSION != " << TAO_MICRO_VERSION
<< "\n#error This file should be regenerated with TAO_IDL"
<< "\n#endif";
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 0c5a0cd1718..6c699eda03d 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -272,7 +272,7 @@ DRV_cpp_init (void)
"-D__TAO_IDL=0x%2.2d%2.2d%2.2d",
ACE_MAJOR_VERSION,
ACE_MINOR_VERSION,
- ACE_BETA_VERSION);
+ ACE_MICRO_VERSION);
DRV_cpp_putarg (version_option);
DRV_cpp_putarg ("-I.");
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 8549234dfef..d718246f0e2 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
#
-#
+#
#
# Common Makefile rules for all of TAO
#
@@ -130,11 +130,13 @@ endif # ! CROSS-COMPILE
ifeq (cmd,$(findstring cmd,$(SHELL)))
TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
-TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
+TAO_MICRO_VERSION := $(shell awk "/TAO_MICRO_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
+TAO_BETA_VERSION := $(shell awk "/TAO_MICRO_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
else
TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
-TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
+TAO_MICRO_VERSION := $(shell awk '/TAO_MICRO_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
+TAO_BETA_VERSION := $(shell awk '/TAO_MICRO_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
endif
-GNUACE_PROJECT_VERSION ?= $(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION)
+GNUACE_PROJECT_VERSION ?= $(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_MICRO_VERSION)
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 25390580a30..c0794d551bd 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,5 +4,8 @@
#define TAO_MAJOR_VERSION 2
#define TAO_MINOR_VERSION 3
+#define TAO_MICRO_VERSION 4
#define TAO_BETA_VERSION 4
#define TAO_VERSION "2.3.4"
+#define TAO_VERSION_CODE 131844
+#define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/TAO/tao/Versioned_Namespace.h b/TAO/tao/Versioned_Namespace.h
index 656decd3a90..142e88c9f86 100644
--- a/TAO/tao/Versioned_Namespace.h
+++ b/TAO/tao/Versioned_Namespace.h
@@ -36,9 +36,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 TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) TAO_ ## MAJOR ## _ ## MINOR ## _ ## BETA
-# define TAO_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,BETA) TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA)
-# define TAO_VERSIONED_NAMESPACE_NAME TAO_MAKE_VERSIONED_NAMESPACE_NAME(TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION)
+# define TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,MICRO) TAO_ ## MAJOR ## _ ## MINOR ## _ ## MICRO
+# define TAO_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,MICRO) TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,MICRO)
+# define TAO_VERSIONED_NAMESPACE_NAME TAO_MAKE_VERSIONED_NAMESPACE_NAME(TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION)
# endif /* !TAO_VERSIONED_NAMESPACE_NAME */
# define TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_VERSIONED_NAMESPACE_NAME {
View Lorry Controller Status