From 53f4a8826c9002a81f8c37acee13778c3f6674d0 Mon Sep 17 00:00:00 2001 From: INMakrus Date: Mon, 22 Feb 2016 23:17:29 +0100 Subject: Update Time_Value.inl - Handle big positiv and negativ double values by limiting them to possible values for sec and usec - Correct round for negativ double values: -10.5 => -10 -500000 (not -10 -499999) - no normalize needed cause result is already normalized --- ACE/ace/Time_Value.inl | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index a4b095033e7..98459b47713 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -70,10 +70,22 @@ ACE_INLINE void ACE_Time_Value::set (double d) { // ACE_OS_TRACE ("ACE_Time_Value::set"); - time_t l = (time_t) d; - this->tv_.tv_sec = l; - this->tv_.tv_usec = (suseconds_t) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5); - this->normalize (); + if (d < ACE_Numeric_Limits::min()) + { + this->tv_.tv_sec = ACE_Numeric_Limits::min(); + this->tv_.tv_usec = -ACE_ONE_SECOND_IN_USECS + 1; + } + else if (d > ACE_Numeric_Limits::max()) + { + this->tv_.tv_sec = ACE_Numeric_Limits::max(); + this->tv_.tv_usec = ACE_ONE_SECOND_IN_USECS - 1; + } + else + { + time_t l = (time_t) d; + this->tv_.tv_sec = l; + this->tv_.tv_usec = (suseconds_t) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + (d < 0 ? -0.5 : 0.5)); + } } /// Initializes a timespec_t. Note that this approach loses precision -- cgit v1.2.1 From 5f2fcf252b7b9790a2cb27e57f9d90ae7ea32f9e Mon Sep 17 00:00:00 2001 From: INMakrus Date: Mon, 22 Feb 2016 23:18:46 +0100 Subject: Update Time_Value.cpp - Better performance by not using a loop for normalizing time values --- ACE/ace/Time_Value.cpp | 66 +++++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 36ba22b8ae2..b390d815bc4 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -174,52 +174,30 @@ ACE_Time_Value::dump (void) const void ACE_Time_Value::normalize (bool saturate) { - // // ACE_OS_TRACE ("ACE_Time_Value::normalize"); - // From Hans Rohnert... - - if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS) - { - /*! \todo This loop needs some optimization. - */ - if (!saturate) // keep the conditionnal expression outside the while loop to minimize performance cost - do - { - ++this->tv_.tv_sec; - this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS; - } - while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS); - else - do - if (this->tv_.tv_sec < ACE_Numeric_Limits::max()) - { - ++this->tv_.tv_sec; - this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS; - } - else - this->tv_.tv_usec = ACE_ONE_SECOND_IN_USECS - 1; - while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS); - } - else if (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) + // ACE_OS_TRACE ("ACE_Time_Value::normalize"); + if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS || + this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) { - /*! \todo This loop needs some optimization. - */ - if (!saturate) - do - { - --this->tv_.tv_sec; - this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS; - } - while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS); + time_t sec = abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); + suseconds_t usec = this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS; + + if (saturate && this->tv_.tv_sec > 0 && sec > 0 && + ACE_Numeric_Limits::max() - this->tv_.tv_sec < sec) + { + this->tv_.tv_sec = ACE_Numeric_Limits::max(); + this->tv_.tv_usec = ACE_ONE_SECOND_IN_USECS - 1; + } + else if (saturate && this->tv_.tv_sec < 0 && sec < 0 && + ACE_Numeric_Limits::min() - this->tv_.tv_sec > sec) + { + this->tv_.tv_sec = ACE_Numeric_Limits::min(); + this->tv_.tv_usec = -ACE_ONE_SECOND_IN_USECS + 1; + } else - do - if (this->tv_.tv_sec > ACE_Numeric_Limits::min()) - { - --this->tv_.tv_sec; - this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS; - } - else - this->tv_.tv_usec = -ACE_ONE_SECOND_IN_USECS + 1; - while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS); + { + this->tv_.tv_sec += sec; + this->tv_.tv_usec = usec; + } } if (this->tv_.tv_sec >= 1 && this->tv_.tv_usec < 0) -- cgit v1.2.1 From 58100d3aeae33252ad12446f620382734e8f02d2 Mon Sep 17 00:00:00 2001 From: INMarkus Date: Tue, 23 Feb 2016 11:39:20 +0100 Subject: Update Time_Value_Test.cpp Added tests for setting of double values and to check performance of normalize for large numbers. --- ACE/tests/Time_Value_Test.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp index 5806d67179f..04ec4b3f553 100644 --- a/ACE/tests/Time_Value_Test.cpp +++ b/ACE/tests/Time_Value_Test.cpp @@ -115,6 +115,51 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT ("msec const test failed: %Q should be 42555\n"), ms)); + // Test setting double values + ACE_Time_Value d1(10, 500000); + ACE_Time_Value d2; + d2.set(10.5); + + ACE_Time_Value d3(-10, -500000); + ACE_Time_Value d4; + d4.set(-10.5); + + ACE_TEST_ASSERT (d1 == d2); + ACE_TEST_ASSERT (d3 == d4); + ACE_TEST_ASSERT (d1 + d3 == ACE_Time_Value::zero); + ACE_TEST_ASSERT (d3 + d1 == ACE_Time_Value::zero); + ACE_TEST_ASSERT (d2 + d4 == ACE_Time_Value::zero); + ACE_TEST_ASSERT (d4 + d2 == ACE_Time_Value::zero); + ACE_TEST_ASSERT (ACE_Time_Value::zero - d1 = d3); + ACE_TEST_ASSERT (ACE_Time_Value::zero - d3 = d1); + ACE_TEST_ASSERT (ACE_Time_Value::zero - d2 = d4); + ACE_TEST_ASSERT (ACE_Time_Value::zero - d4 = d2); + + ACE_Time_Value d5; + d5.set(DBL_MAX); + ACE_TEST_ASSERT (d5 == ACE_Time_Value::max_time); + + // Test performance of normalize() + ACE_Time_Value v1(ACE_Numeric_Limits::max(), + ACE_Numeric_Limits::max()); + ACE_Time_Value v2(ACE_Numeric_Limits::min(), + ACE_Numeric_Limits::min()); + ACE_Time_Value v3(ACE_Numeric_Limits::max(), + ACE_Numeric_Limits::min()); + ACE_Time_Value v4(ACE_Numeric_Limits::min(), + ACE_Numeric_Limits::max()); + + v1.set(ACE_Numeric_Limits::max(), + ACE_Numeric_Limits::max()); + v2.set(ACE_Numeric_Limits::min(), + ACE_Numeric_Limits::min()); + v3.set(ACE_Numeric_Limits::max(), + ACE_Numeric_Limits::min()); + v4.set(ACE_Numeric_Limits::min(), + ACE_Numeric_Limits::max()); + + v1.set(DBL_MAX); + // Test setting from ACE_UINT64 ms = 42555; ACE_Time_Value msec_test3; -- cgit v1.2.1 From 93679e1d90c81ee76254a959d943ecc616e8ac84 Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Mon, 16 May 2016 23:05:52 +0300 Subject: Handle system functions that may be defined as macros on some platforms --- ACE/ace/OS_NS_stdlib.h | 10 ++++++++++ ACE/ace/OS_NS_stdlib.inl | 2 +- ACE/ace/OS_NS_time.cpp | 2 +- ACE/ace/OS_NS_time.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ ACE/ace/OS_NS_time.inl | 6 +++--- 5 files changed, 60 insertions(+), 5 deletions(-) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index c7b89a06fc3..95e65410297 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -77,6 +77,16 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) } #endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ +inline int ace_rand_r_helper (unsigned *seed) +{ +#if defined (rand_r) + return rand_r (seed); +#undef rand_r +#else + return ACE_STD_NAMESPACE::rand_r (seed); +#endif /* rand_r */ +} + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 2c0f4c36991..cb59874b3cf 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -431,7 +431,7 @@ ACE_OS::rand_r (unsigned int *seed) *seed = (unsigned int)new_seed; return (int) (new_seed & RAND_MAX); #else - return ::rand_r (seed); + return ace_rand_r_helper (seed); # endif /* ACE_LACKS_RAND_R */ } diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 3d4fcc93d47..2ab3c7ebe47 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -287,7 +287,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) return res; } #else - ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0); + return ace_localtime_r_helper (t, res); #endif /* ACE_HAS_TR24731_2005_CRT */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 11d226ea28b..4ef60a3c8ab 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -90,6 +90,51 @@ inline long ace_timezone() #endif } +/* + * We inline and undef some functions that may be implemented + * as macros on some platforms. This way macro definitions will + * be usable later as there is no way to save the macro definition + * using the pre-processor. + */ +inline char *ace_asctime_r_helper (const struct tm *t, char *buf) +{ +#if defined (asctime_r) + return asctime_r (t, buf); +#undef asctime_r +#else + return ACE_STD_NAMESPACE::asctime_r (t, buf); +#endif /* defined (asctime_r) */ +} + +inline char *ace_ctime_r_helper (const time_t *t, char *bufp) +{ +#if defined (ctime_r) + return ctime_r (t, bufp); +#undef ctime_r +#else + return ACE_STD_NAMESPACE::ctime_r (t, bufp); +#endif /* defined (ctime_r) */ +} + +inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) +{ +#if defined (gmtime_r) + return gmtime_r (clock, res); +#undef gmtime_r +#else + return ACE_STD_NAMESPACE::gmtime_r (clock, res); +#endif /* defined (gmtime_r) */ +} + +inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) +{ +#if defined (localtime_r) + return localtime_r (clock, res); +#undef localtime_r +#else + return ACE_STD_NAMESPACE::localtime_r (clock, res); +#endif /* defined (localtime_r) */ +} #if !defined (ACE_LACKS_DIFFTIME) # if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index c821530bc82..48468ce2837 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -26,7 +26,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) #if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) char *result = 0; - ACE_OSCALL (::asctime_r (t, buf), char *, 0, result); + ace_asctime_r_helper (t, buf); ACE_OS::strsncpy (buf, result, buflen); return buf; # else @@ -143,7 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) - ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp); + return ace_ctime_r_helper (t, bufp); # else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) @@ -375,7 +375,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) { ACE_OS_TRACE ("ACE_OS::gmtime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) - ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0); + return ace_gmtime_r_helper (t, res); #elif defined (ACE_HAS_TR24731_2005_CRT) struct tm *tm_p = res; ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p); -- cgit v1.2.1 From 404dd3030866ecaae7663f8382ccb5b30b244637 Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Fri, 10 Jun 2016 19:01:22 +0300 Subject: Do not use ACE_STD_NAMESPACE macro --- ACE/ace/OS_NS_stdlib.h | 2 +- ACE/ace/OS_NS_time.h | 16 +++------------- ACE/ace/OS_NS_time.inl | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 95e65410297..a6ffa8eb4f4 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -83,7 +83,7 @@ inline int ace_rand_r_helper (unsigned *seed) return rand_r (seed); #undef rand_r #else - return ACE_STD_NAMESPACE::rand_r (seed); + return ::rand_r (seed); #endif /* rand_r */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 4ef60a3c8ab..f995fdd46b1 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -102,27 +102,17 @@ inline char *ace_asctime_r_helper (const struct tm *t, char *buf) return asctime_r (t, buf); #undef asctime_r #else - return ACE_STD_NAMESPACE::asctime_r (t, buf); + return ::asctime_r (t, buf); #endif /* defined (asctime_r) */ } -inline char *ace_ctime_r_helper (const time_t *t, char *bufp) -{ -#if defined (ctime_r) - return ctime_r (t, bufp); -#undef ctime_r -#else - return ACE_STD_NAMESPACE::ctime_r (t, bufp); -#endif /* defined (ctime_r) */ -} - inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) { #if defined (gmtime_r) return gmtime_r (clock, res); #undef gmtime_r #else - return ACE_STD_NAMESPACE::gmtime_r (clock, res); + return ::gmtime_r (clock, res); #endif /* defined (gmtime_r) */ } @@ -132,7 +122,7 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) return localtime_r (clock, res); #undef localtime_r #else - return ACE_STD_NAMESPACE::localtime_r (clock, res); + return ::localtime_r (clock, res); #endif /* defined (localtime_r) */ } diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 48468ce2837..f066be30b60 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -143,7 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) - return ace_ctime_r_helper (t, bufp); + ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp); # else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) -- cgit v1.2.1 From dcdedb05f23e55c2c9b718e666554ed6e75d99a5 Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Thu, 7 Jul 2016 20:15:29 -0400 Subject: Case 2025, see notes (cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0) --- ACE/include/makeinclude/macros.GNU | 3 ++- ACE/include/makeinclude/rules.local.GNU | 3 ++- ACE/include/makeinclude/rules.nested.GNU | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU index aca73bb20da..5774427d892 100644 --- a/ACE/include/makeinclude/macros.GNU +++ b/ACE/include/makeinclude/macros.GNU @@ -22,7 +22,8 @@ TARGETS_LOCAL = \ depend.local \ rcs_info.local \ idl_stubs.local \ - svnignore.local + svnignore.local \ + $(PRIVATE_TARGETS_LOCAL) TARGETS_NESTED = \ $(TARGETS_LOCAL:.local=.nested) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index a878e24c34f..5d3b81781c1 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -426,7 +426,8 @@ endif # DO_CLEANUP # Dependency generation target #---------------------------------------------------------------------------- -MAKEFILE ?= GNUmakefile +TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) +MAKEFILE ?= $(TOP_MAKEFILE) DEPENDENCY_FILE ?= $(MAKEFILE) IDL_DEPENDENCY_FILES ?= $(MAKEFILE) diff --git a/ACE/include/makeinclude/rules.nested.GNU b/ACE/include/makeinclude/rules.nested.GNU index 16073934ac8..42ec2e4e443 100644 --- a/ACE/include/makeinclude/rules.nested.GNU +++ b/ACE/include/makeinclude/rules.nested.GNU @@ -10,7 +10,8 @@ # variable must be set to its actual name before including this # file to allow the recursive MAKE to work properly. -MAKEFILE ?= GNUmakefile +TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) +MAKEFILE ?= $(TOP_MAKEFILE) SUBDIR_MAKEFILE ?= $(MAKEFILE) # Make sure that we build directories with DIRS= in sequence instead of in -- cgit v1.2.1 From 7627b5e0073d58550491af5493237880f514b66a Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Thu, 14 Jul 2016 15:13:27 -0400 Subject: Revert "Case 2025, see notes"; should have made this a pull request. This reverts commit dcdedb05f23e55c2c9b718e666554ed6e75d99a5. --- ACE/include/makeinclude/macros.GNU | 3 +-- ACE/include/makeinclude/rules.local.GNU | 3 +-- ACE/include/makeinclude/rules.nested.GNU | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU index 5774427d892..aca73bb20da 100644 --- a/ACE/include/makeinclude/macros.GNU +++ b/ACE/include/makeinclude/macros.GNU @@ -22,8 +22,7 @@ TARGETS_LOCAL = \ depend.local \ rcs_info.local \ idl_stubs.local \ - svnignore.local \ - $(PRIVATE_TARGETS_LOCAL) + svnignore.local TARGETS_NESTED = \ $(TARGETS_LOCAL:.local=.nested) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 5d3b81781c1..a878e24c34f 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -426,8 +426,7 @@ endif # DO_CLEANUP # Dependency generation target #---------------------------------------------------------------------------- -TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) -MAKEFILE ?= $(TOP_MAKEFILE) +MAKEFILE ?= GNUmakefile DEPENDENCY_FILE ?= $(MAKEFILE) IDL_DEPENDENCY_FILES ?= $(MAKEFILE) diff --git a/ACE/include/makeinclude/rules.nested.GNU b/ACE/include/makeinclude/rules.nested.GNU index 42ec2e4e443..16073934ac8 100644 --- a/ACE/include/makeinclude/rules.nested.GNU +++ b/ACE/include/makeinclude/rules.nested.GNU @@ -10,8 +10,7 @@ # variable must be set to its actual name before including this # file to allow the recursive MAKE to work properly. -TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) -MAKEFILE ?= $(TOP_MAKEFILE) +MAKEFILE ?= GNUmakefile SUBDIR_MAKEFILE ?= $(MAKEFILE) # Make sure that we build directories with DIRS= in sequence instead of in -- cgit v1.2.1 From c752cc58a68f2f91da9550764a55b6dc7f91432c Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Thu, 7 Jul 2016 20:15:29 -0400 Subject: Case 2025, see notes (cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0) --- ACE/include/makeinclude/macros.GNU | 3 ++- ACE/include/makeinclude/rules.local.GNU | 3 ++- ACE/include/makeinclude/rules.nested.GNU | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU index aca73bb20da..5774427d892 100644 --- a/ACE/include/makeinclude/macros.GNU +++ b/ACE/include/makeinclude/macros.GNU @@ -22,7 +22,8 @@ TARGETS_LOCAL = \ depend.local \ rcs_info.local \ idl_stubs.local \ - svnignore.local + svnignore.local \ + $(PRIVATE_TARGETS_LOCAL) TARGETS_NESTED = \ $(TARGETS_LOCAL:.local=.nested) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index a878e24c34f..5d3b81781c1 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -426,7 +426,8 @@ endif # DO_CLEANUP # Dependency generation target #---------------------------------------------------------------------------- -MAKEFILE ?= GNUmakefile +TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) +MAKEFILE ?= $(TOP_MAKEFILE) DEPENDENCY_FILE ?= $(MAKEFILE) IDL_DEPENDENCY_FILES ?= $(MAKEFILE) diff --git a/ACE/include/makeinclude/rules.nested.GNU b/ACE/include/makeinclude/rules.nested.GNU index 16073934ac8..42ec2e4e443 100644 --- a/ACE/include/makeinclude/rules.nested.GNU +++ b/ACE/include/makeinclude/rules.nested.GNU @@ -10,7 +10,8 @@ # variable must be set to its actual name before including this # file to allow the recursive MAKE to work properly. -MAKEFILE ?= GNUmakefile +TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) +MAKEFILE ?= $(TOP_MAKEFILE) SUBDIR_MAKEFILE ?= $(MAKEFILE) # Make sure that we build directories with DIRS= in sequence instead of in -- cgit v1.2.1 From b169ad5ff5c2fe5e0b92f96f871bd568e3e18bcf Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 2 Aug 2016 15:37:58 +0200 Subject: Indent changes to fix gcc 6.1 warnings * TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp: --- TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp | 106 +++++++++++++++----------------- 1 file changed, 51 insertions(+), 55 deletions(-) diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp index 7b3e920b8ca..053ac1bba8b 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp @@ -9,7 +9,6 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 - #if !defined (__ACE_INLINE__) #include "tao/Dynamic_TP/DTP_POA_Strategy.inl" #endif /* ! __ACE_INLINE__ */ @@ -25,7 +24,6 @@ TAO_DTP_POA_Strategy::CustomRequestOutcome TAO_DTP_POA_Strategy::custom_synch_request( TAO::CSD::TP_Custom_Request_Operation* op) { - TAO::CSD::TP_Servant_State::HandleType servant_state = this->get_servant_state(op->servant()); @@ -338,7 +336,6 @@ TAO_DTP_POA_Strategy::get_servant_state (PortableServer::Servant servant) void TAO_DTP_POA_Strategy::set_dtp_config (TAO_DTP_Definition &tp_config) { - if (tp_config.min_threads_ <= 0) { this->dtp_task_.set_min_pool_threads (1); @@ -362,67 +359,66 @@ TAO_DTP_POA_Strategy::set_dtp_config (TAO_DTP_Definition &tp_config) } // max_pool_threads_ - if (tp_config.max_threads_ <= 0) { // Set to 0 so that max is unbounded. this->dtp_task_.set_max_pool_threads(0); } else - if (tp_config.max_threads_ < tp_config.init_threads_) - { - this->dtp_task_.set_max_pool_threads( - this->dtp_task_.get_init_pool_threads ()); - } - else - { - this->dtp_task_.set_max_pool_threads (tp_config.max_threads_); - } - - // thread_stack_size_ - - if (tp_config.stack_size_ <= 0) - { - this->dtp_task_.set_thread_stack_size (ACE_DEFAULT_THREAD_STACKSIZE); - } - else - { - this->dtp_task_.set_thread_stack_size (tp_config.stack_size_); - } - - // max_request_queue_depth_ - if (tp_config.queue_depth_ < 0) - { - this->dtp_task_.set_max_request_queue_depth (0); - } - else - { - this->dtp_task_.set_max_request_queue_depth (tp_config.queue_depth_); - } - - - if (TAO_debug_level > 4) { - TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy: ") - ACE_TEXT ("Initialized with:\n") - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy initial_pool_threads_=") - ACE_TEXT ("[%d]\n") - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy min_pool_threads_=[%d]\n") - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy max_pool_threads_=[%d]\n") - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy max_request_queue_depth_=") - ACE_TEXT ("[%d]\n") - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy thread_stack_size_=[%d]\n") - ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy thread_idle_time_=[%d]\n"), - this->dtp_task_.get_init_pool_threads(), - this->dtp_task_.get_min_pool_threads(), - this->dtp_task_.get_max_pool_threads(), - this->dtp_task_.get_max_request_queue_depth(), - this->dtp_task_.get_thread_stack_size(), - this->dtp_task_.get_thread_idle_time())); + if (tp_config.max_threads_ < tp_config.init_threads_) + { + this->dtp_task_.set_max_pool_threads( + this->dtp_task_.get_init_pool_threads ()); + } + else + { + this->dtp_task_.set_max_pool_threads (tp_config.max_threads_); + } + } + + // thread_stack_size_ + if (tp_config.stack_size_ <= 0) + { + this->dtp_task_.set_thread_stack_size (ACE_DEFAULT_THREAD_STACKSIZE); + } + else + { + this->dtp_task_.set_thread_stack_size (tp_config.stack_size_); + } + + // max_request_queue_depth_ + if (tp_config.queue_depth_ < 0) + { + this->dtp_task_.set_max_request_queue_depth (0); + } + else + { + this->dtp_task_.set_max_request_queue_depth (tp_config.queue_depth_); + } + + if (TAO_debug_level > 4) + { + TAOLIB_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy: ") + ACE_TEXT ("Initialized with:\n") + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy initial_pool_threads_=") + ACE_TEXT ("[%d]\n") + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy min_pool_threads_=[%d]\n") + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy max_pool_threads_=[%d]\n") + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy max_request_queue_depth_=") + ACE_TEXT ("[%d]\n") + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy thread_stack_size_=[%d]\n") + ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy thread_idle_time_=[%d]\n"), + this->dtp_task_.get_init_pool_threads(), + this->dtp_task_.get_min_pool_threads(), + this->dtp_task_.get_max_pool_threads(), + this->dtp_task_.get_max_request_queue_depth(), + this->dtp_task_.get_thread_stack_size(), + this->dtp_task_.get_thread_idle_time())); } } -TAO_END_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ -- cgit v1.2.1 From 61ff36da99c1645ba67fa8533331b80060e17145 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 2 Aug 2016 20:07:47 +0200 Subject: Rework to mention that occasional contributors should use pull requests * README.md: --- README.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 842b139ecd3..9f6f005cbdb 100644 --- a/README.md +++ b/README.md @@ -76,17 +76,10 @@ The project assumes one of 3 _roles_ an individual may assume when interacting w ### Occasional Contributor -This role defines a user who browses through the source code of the project and occasionally submits patches. Patches may be submitted in one of two ways: - -* Attach a patch file to the Bugzila issue (ATCD Bug tracking system may be found [here](http://bugzilla.dre.vanderbilt.edu/)). -* Creating a pull request on GitHub - -The approach a contributor chooses to use depends entirely his/her personal preference, but usually is tied to how the -contributor accesses ACE/TAO source code. If the contributor directly clones the upstream repository, -they should submit patch files. If the contributor instead uses their personal GitHub account to fork the upstream repository, then they are should issue a pull request. - -![Tip][tip] A GitHub pull request is the preferred method to submit a patch! +This role defines a user who browses through the source code of the project and occasionally submits patches. +A occasional contributor will only submit patches via a pull requests. The pull request will be submitted via GitHub. +Occasional contributors should *always* fork the upstream project on GitHub and work off a clone of this fork #### Attach a patch file to the Bugzilla issue -- cgit v1.2.1 From fd4a20a4ece2885687ba2092737acdc8d4898dde Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 2 Aug 2016 20:26:53 +0200 Subject: Further cleanup of bugzilla mentining * README.md: --- README.md | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/README.md b/README.md index 9f6f005cbdb..046a374ba64 100644 --- a/README.md +++ b/README.md @@ -77,21 +77,10 @@ The project assumes one of 3 _roles_ an individual may assume when interacting w ### Occasional Contributor This role defines a user who browses through the source code of the project and occasionally submits patches. -A occasional contributor will only submit patches via a pull requests. The pull request will be submitted via GitHub. +An occasional contributor will only submit patches via a pull requests. The pull request will be submitted via GitHub. Occasional contributors should *always* fork the upstream project on GitHub and work off a clone of this fork -#### Attach a patch file to the Bugzilla issue - -![Git Workflow 1](https://docs.jboss.org/author/download/attachments/4784485/git_wf_1.png) - -In this workflow, the contributor directly clones the upstream repository, makes changes to his local clone, adequately tests and commits his work with proper comments (more on commit comments later), and generates a patch. The patch should then be attached to the Bugzilla issue. - -More information on generating patches suitable for attaching to a Bugzilla can be found in [Chapter 5, Section 2](http://progit.org/book/ch5-2.html) of Pro Git, under the section titled *Public Large Project*. - -![Warning][warn] Rather than emailing the patches to a developer mail list, please attach your patch to the Bugzilla issue. - - #### Creating a pull request on GitHub ![Git Workflow 2](https://docs.jboss.org/author/download/attachments/4784485/git_wf_2.png) @@ -220,14 +209,6 @@ Project Admins have a very limited role. Only Project Admins are allowed to push This approach ensures ACE/TAO maintains quality on the main code source tree, and allows for important code reviews to take place again ensuring quality. Further, it ensures clean and easily traceable code history and makes sure that more than one person knows about the changes being performed. -#### Merging in patches - -![Git Workflow 3](https://docs.jboss.org/author/download/attachments/4784485/git_wf_3.png) - -Patches submitted via Bugzilla are audited and promoted to the upstream repository as detailed above. A Project Admin would typically create a working branch to which the patch is applied and tested. The patch can be further modified, cleaned up, and commit messages made clearer if necessary. The branch should then be merged to the master or one of the maintenance branches before being pushed. - -More information on applying patches can be found in [Chapter 5, Section 3](http://progit.org/book/ch5-3.html) of Pro Git, under *Applying Patches From Email.* - #### Handling pull requests ![Git Workflow 4](https://docs.jboss.org/author/download/attachments/4784485/git_wf_4.png) -- cgit v1.2.1 From a84855c64690c8048fe1a8513c0a8b54af345b4b Mon Sep 17 00:00:00 2001 From: David Lifshitz Date: Tue, 2 Aug 2016 16:30:12 -0400 Subject: BZ-4216 Android build fails when not cross-compiled on Linux [Changed] platform_android.GNU - replace the platform_linux_common.GNU include with its contents except the erroneous call to getconf [Tests] Test 1: 1) Compile ACE for Android using OSX or Windows 2) Verify build is successful --- ACE/include/makeinclude/platform_android.GNU | 118 ++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 0a3894b7817..2bbbbe19259 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -9,7 +9,123 @@ no_hidden_visibility ?= 1 # as of NDK r6 inlining is required inline ?= 1 -include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU +# start of: include most of platform_linux_common.GNU + +# We always include config-linux.h on Linux platforms. +ACE_PLATFORM_CONFIG ?= config-linux.h + +debug ?= 1 +optimize ?= 1 +threads ?= 1 +insure ?= 0 + +LSB_RELEASE_ID := $(shell lsb_release -i 2> /dev/null || echo Distributor ID: Unknown) +LSB_RELEASE_RELEASE := $(shell lsb_release -r 2> /dev/null || echo Release: Unknown) + +PLATFORM_XT_CPPFLAGS= +PLATFORM_XT_LIBS=-lXt +PLATFORM_XT_LDFLAGS= + +PLATFORM_FL_CPPFLAGS= +PLATFORM_FL_LIBS=-lfltk -lfltk_forms -lfltk_gl +PLATFORM_FL_LDFLAGS= + +PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include +PLATFORM_X11_LIBS=-lX11 +PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib + +PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include +PLATFORM_GL_LIBS =-lGL +PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib + +PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags) +PLATFORM_GTK_LIBS =$(shell gtk-config --libs) +PLATFORM_GTK_LDFLAGS = + +PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox +PLATFORM_FOX_LIBS ?= -lFOX +PLATFORM_FOX_LDFLAGS ?= + +# NOTE: we only support wxWindows over GTK +PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS) +PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) +PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS) + +PLATFORM_BOOST_CPPFLAGS ?= +PLATFORM_BOOST_LDLAGS ?= +PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework + +ifeq ($(buildbits),64) +PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib64/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib64/tkConfig.sh && echo -n $$TK_LIB_FLAG) +else +PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG) +endif +PLATFORM_TK_LDFLAGS= + +ifeq ($(buildbits),64) +PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib64/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS) +PLATFORM_TCL_LIBS=$(shell . /usr/lib64/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG)) +else +PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS) +PLATFORM_TCL_LIBS=$(shell . /usr/lib/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG)) +endif +PLATFORM_TCL_LDFLAGS= + +PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include +PLATFORM_QT_LIBS ?= -lqt-mt +PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib + +sctp ?= +# support for OpenSS7 SCTP +ifeq ($(sctp),openss7) + PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_OPENSS7_SCTP + PLATFORM_SCTP_LDFLAGS?= + PLATFORM_SCTP_LIBS?= +endif + +# support for LKSCTP (Linux Kernel 2.5) +ifeq ($(sctp),lksctp) + PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_LKSCTP + PLATFORM_SCTP_LDFLAGS?= -L/usr/local/lib + PLATFORM_SCTP_LIBS?= -lsctp +endif + +GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION 2> /dev/null || echo Unknown) +ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) + NPTL_VERS := $(subst ., ,$(word 2,$(GNU_LIBPTHREAD_VERSION))) + ifneq (0, $(word 1,$(NPTL_VERS))) + nptl ?= 1 + endif +endif +nptl ?= 0 +ifeq ($(nptl),0) + CPPFLAGS += -DACE_LACKS_LINUX_NPTL +endif + +ssl ?= 0 +ifeq ($(ssl),1) + # Some Linux OpenSSL installations compile in Kerberos support. Add + # the Kerberos include path to preprocessor include path. + # + # We should probably also add the Kerberos libraries to + # PLATFORM_SSL_LIBS but we can't be sure if they are needed without + # a more sophisticated check. This will only be a problem when + # statically linking the OpenSSL library. The majority of + # installations use shared OpenSSL libraries so we should be okay, + # at least until we migrate to Autoconf. + PLATFORM_SSL_CPPFLAGS += -I/usr/kerberos/include +endif # ssl + +SYSARCH := $(shell uname -m) + +PIC = -fPIC +AR ?= ar +ARFLAGS ?= rsuv +RANLIB = @true + +# end of: include most of platform_linux_common.GNU #No rwho on Android rwho = 0 -- cgit v1.2.1 From 72485ec324e2c11a24ec679e8269c38122e323fc Mon Sep 17 00:00:00 2001 From: David Lifshitz Date: Tue, 2 Aug 2016 16:36:20 -0400 Subject: BZ-4217 Android 6 with 3rd party AIO not working [Changed] POSIX_Proactor.cpp - disable an OS bounds check for Android since it does not support AIO and ACE_HAS_AIO_CALLS will only be defined if a 3rd party lib is used [Tests] Test 1: 1) Compile ACE for Android using a 3rd party AIO lib 2) In the implementation of ACE_Service_Handler::open, try to read from an ACE_Asynch_Read_Stream 3) Verify it returns >= 0 with no error --- ACE/ace/POSIX_Proactor.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 4d5105ae03e..0d7f3231b10 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -920,6 +920,12 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () { +#if !defined (ACE_ANDROID) + // Android API 23 introduced a define _POSIX_AIO_MAX 1 which gets used by _SC_AIO_MAX. + // Previously, without the define, the value returned was -1, which got ignored. + // Officially, the Android OS does not support AIO so if ACE_HAS_AIO_CALLS is defined + // then a 3rd party library must be in use and this check is invalid. + long max_os_aio_num = ACE_OS::sysconf (_SC_AIO_MAX); // Define max limit AIO's for concrete OS @@ -929,6 +935,7 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () if (max_os_aio_num > 0 && aiocb_list_max_size_ > (unsigned long) max_os_aio_num) aiocb_list_max_size_ = max_os_aio_num; +#endif #if defined (HPUX) || defined (__FreeBSD__) // Although HPUX 11.00 allows to start 2048 AIO's for all process in -- cgit v1.2.1 From 7664aa6b6c0f77ff5cdc01b16c1fe22c800dbd56 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 5 Aug 2016 10:22:26 +0200 Subject: Fixed typo and layout change * TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp: * TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp: --- TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index b0f247456b4..c3bf761f86a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -589,7 +589,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( } /// @todo: rather than is_error, use pacing interval so it will be configurable -/// @todo: find some way to use batch buffering stratgy for sequence consumers. +/// @todo: find some way to use batch buffering strategy for sequence consumers. void TAO_Notify_Consumer::schedule_timer (bool is_error) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index f6a54aefa5c..483546e7e7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -74,8 +74,7 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier) if (max_suppliers != 0 && supplier_count >= max_suppliers.value ()) { - throw CORBA::IMP_LIMIT ( - ); // we've reached the limit of suppliers connected. + throw CORBA::IMP_LIMIT (); // we've reached the limit of suppliers connected. } { -- cgit v1.2.1 From b17449e2d53c67fb7343e594d65dcbd915d1d0b0 Mon Sep 17 00:00:00 2001 From: Peter Oschwald Date: Tue, 9 Aug 2016 11:41:05 -0500 Subject: Fix use case for non-ACE/TAO/CIAO/DAnCE footprint calculations. Need to actually populate an array to pass to sort_list. --- ACE/bin/generate_compile_stats.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ACE/bin/generate_compile_stats.sh b/ACE/bin/generate_compile_stats.sh index cbddc963c4c..feefae760ad 100755 --- a/ACE/bin/generate_compile_stats.sh +++ b/ACE/bin/generate_compile_stats.sh @@ -973,7 +973,7 @@ create_html () local DEST=$1 local TYPE=$2 - local ALL_BASE="" + local ALL_OBJS="" local ACE_OBJS="" local TAO_OBJS="" local CIAO_OBJS="" @@ -993,7 +993,7 @@ create_html () elif [ "${base}" != "${base#ACE}" ]; then ACE_OBJS="${ACE_OBJS} ${base}" fi - ALL_OBJS="${ALL_BASE} ${base}" + ALL_OBJS="${ALL_OBJS} ${base}" done # create main page @@ -1014,7 +1014,7 @@ create_html () sort_list ${DAnCE_OBJS} | create_page "DAnCE" ${TYPE} > ${DEST}/${name} else name="all_${TYPE}.html" - sort_list ${ACE_OBJS} | create_page $BASE_TITLE ${TYPE} > ${DEST}/${name} + sort_list ${ALL_OBJS} | create_page $BASE_TITLE ${TYPE} > ${DEST}/${name} fi fi } -- cgit v1.2.1 From 1b4dabcbd23e2892df7766bb719a64e001bdd9a5 Mon Sep 17 00:00:00 2001 From: Peter Oschwald Date: Tue, 9 Aug 2016 16:48:47 -0500 Subject: Remove sed search and replace as it malfunctions with files or directories ending or beginning with a 0, which in some cases like tests, causes the output links to break in the created report pages. --- ACE/bin/generate_compile_stats.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ACE/bin/generate_compile_stats.sh b/ACE/bin/generate_compile_stats.sh index feefae760ad..921119ca869 100755 --- a/ACE/bin/generate_compile_stats.sh +++ b/ACE/bin/generate_compile_stats.sh @@ -958,8 +958,7 @@ sort_list () #echo $i done - # sort eats underscores, soo... - sed "s/___/000/g" ${DEST}/tmp_list | sort -f | sed "s/000/___/g" + sort -f ${DEST}/tmp_list } ############################################################################### -- cgit v1.2.1 From ad958e7639275dc8626599ac0bfcc805a7e4ea76 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 10 Aug 2016 13:28:52 +0200 Subject: Fixed typos * ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: * ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: * ACE/examples/QOS/Simple/QoS_Util.cpp: * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp: * TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h: * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h: * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h: --- ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp | 2 +- ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp | 2 +- ACE/examples/QOS/Simple/QoS_Util.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp | 2 -- TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h | 2 +- TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h | 2 +- TAO/orbsvcs/tests/AVStreams/Pluggable/server.h | 6 +++--- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index 4329b7a1638..71d0685af14 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -66,7 +66,7 @@ QoS_Util::parse_args (void) ACE_ERROR_RETURN ((LM_ERROR, "usage: %s" " [-m host:port] QoS multicast session address" - " Overides the receiver address specified in the -n option" + " Overrides the receiver address specified in the -n option" " [-n host:port] Use for a unicast sender. " " Follow by receiver addr" " [-p tcp|udp] specify protocol to be used" diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index 4329b7a1638..71d0685af14 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -66,7 +66,7 @@ QoS_Util::parse_args (void) ACE_ERROR_RETURN ((LM_ERROR, "usage: %s" " [-m host:port] QoS multicast session address" - " Overides the receiver address specified in the -n option" + " Overrides the receiver address specified in the -n option" " [-n host:port] Use for a unicast sender. " " Follow by receiver addr" " [-p tcp|udp] specify protocol to be used" diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp index 4329b7a1638..71d0685af14 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.cpp +++ b/ACE/examples/QOS/Simple/QoS_Util.cpp @@ -66,7 +66,7 @@ QoS_Util::parse_args (void) ACE_ERROR_RETURN ((LM_ERROR, "usage: %s" " [-m host:port] QoS multicast session address" - " Overides the receiver address specified in the -n option" + " Overrides the receiver address specified in the -n option" " [-n host:port] Use for a unicast sender. " " Follow by receiver addr" " [-p tcp|udp] specify protocol to be used" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index 1cb7f208491..98d4536a3ea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -42,8 +42,6 @@ TAO_Notify_Supplier::dispatch_updates_i ( this->subscribe_->subscription_change (added, removed); } - - bool TAO_Notify_Supplier::is_alive (bool allow_nil_supplier) { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 3330849a81a..6eca9f6a293 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -78,7 +78,7 @@ private: * @brief Defines a class for the distributer application callback * for receiving data. * - * This class overides the methods of the TAO_AV_Callback so the + * This class overrides the methods of the TAO_AV_Callback so the * AVStreams can make upcalls to the application. */ class Distributer_Sender_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 3df685c8f03..c179a105c2b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -41,7 +41,7 @@ public: * * @brief Defines a class for the sender application callback. * - * This class overides the methods of the TAO_AV_Callback so the + * This class overrides the methods of the TAO_AV_Callback so the * AVStreams can make upcalls to the application. */ class Sender_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index 555f7b10d95..714eb1d8e3a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -21,7 +21,7 @@ * * @brief Defines a class for the server application callback. * - * This class overides the methods of the TAO_AV_Callback so the + * This class overrides the methods of the TAO_AV_Callback so the * AVStreams can make upcalls to the application. */ class FTP_Server_Callback : public TAO_AV_Callback @@ -63,7 +63,7 @@ private: * @class Server * * @brief Defines the server application class. - * = DESCRIPOTION + * * The actual server progarm that acts as the ftp server that receives data * sent by the ftp client. */ @@ -73,7 +73,7 @@ public: /// Constructor Server (void); - /// Deestructor. + /// Destructor. ~Server (void); /// Initialize data components. -- cgit v1.2.1 From 18cb08464abc1d506ae5c9d50c0428229f8653f6 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 10 Aug 2016 13:40:32 +0200 Subject: Fixed typo * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h: --- TAO/orbsvcs/tests/AVStreams/Pluggable/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index 714eb1d8e3a..9e79d0ccaea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -64,7 +64,7 @@ private: * * @brief Defines the server application class. * - * The actual server progarm that acts as the ftp server that receives data + * The actual server program that acts as the ftp server that receives data * sent by the ftp client. */ class Server -- cgit v1.2.1 From ca6d7f0a90498b003eaa541394c3cb4d54d0f148 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 10 Aug 2016 13:49:57 +0200 Subject: Removed old left over of SGI * ACE/ace/POSIX_Proactor.cpp: --- ACE/ace/POSIX_Proactor.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 0d7f3231b10..28380ce10e5 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -974,40 +974,6 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () ACELIB_DEBUG ((LM_DEBUG, "(%P | %t) ACE_POSIX_AIOCB_Proactor::Max Number of AIOs=%d\n", aiocb_list_max_size_)); - -#if defined(__sgi) - - ACELIB_DEBUG((LM_DEBUG, - ACE_TEXT( "SGI IRIX specific: aio_init!\n"))); - -//typedef struct aioinit { -// int aio_threads; /* The number of aio threads to start (5) */ -// int aio_locks; /* Initial number of preallocated locks (3) */ -// int aio_num; /* estimated total simultanious aiobc structs (1000) */ -// int aio_usedba; /* Try to use DBA for raw I/O in lio_listio (0) */ -// int aio_debug; /* turn on debugging (0) */ -// int aio_numusers; /* max number of user sprocs making aio_* calls (5) */ -// int aio_reserved[3]; -//} aioinit_t; - - aioinit_t aioinit; - - aioinit.aio_threads = 10; /* The number of aio threads to start (5) */ - aioinit.aio_locks = 20; /* Initial number of preallocated locks (3) */ - /* estimated total simultaneous aiobc structs (1000) */ - aioinit.aio_num = aiocb_list_max_size_; - aioinit.aio_usedba = 0; /* Try to use DBA for raw IO in lio_listio (0) */ - aioinit.aio_debug = 0; /* turn on debugging (0) */ - aioinit.aio_numusers = 100; /* max number of user sprocs making aio_* calls (5) */ - aioinit.aio_reserved[0] = 0; - aioinit.aio_reserved[1] = 0; - aioinit.aio_reserved[2] = 0; - - aio_sgi_init (&aioinit); - -#endif - - return; } void -- cgit v1.2.1 From 68e2cf228e4f053358361993c4dccfde507ab9f7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 10 Aug 2016 13:52:41 +0200 Subject: removed SGI from comment, not used anymore * ACE/ace/OS_NS_sys_mman.inl: --- ACE/ace/OS_NS_sys_mman.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index 28f3a9d9d10..cd2931a8e1c 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_VOIDPTR_MMAP) -// Needed for some odd OS's (e.g., SGI). +// Needed for some odd OS's typedef void *ACE_MMAP_TYPE; #else typedef char *ACE_MMAP_TYPE; -- cgit v1.2.1 From 33c4e1e642d55814fd7bcd044a6ac7871208dbc2 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 10 Aug 2016 13:52:48 +0200 Subject: Layout change * ACE/ace/POSIX_Proactor.cpp: --- ACE/ace/POSIX_Proactor.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 28380ce10e5..e3414396b3a 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -992,7 +992,6 @@ ACE_POSIX_AIOCB_Proactor::delete_notify_manager (void) { // We are responsible for delete as all pointers set to 0 after // delete, it is save to delete twice - delete aiocb_notify_pipe_manager_; aiocb_notify_pipe_manager_ = 0; } -- cgit v1.2.1 From c6a04b11d5e960451861a5d51d469dc48376a05f Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 24 Aug 2016 15:39:55 -0500 Subject: fixed makefile syntax error --- ACE/include/makeinclude/platform_g++_common.GNU | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index e4b3ee63d0b..430e8bebb58 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -12,15 +12,9 @@ else ifneq ($(CROSS_COMPILE),) CROSS-COMPILE = 1 # Build using the cross-tools - ifneq ($($CROSS_COMPILE_POSTFIX),) - CC = ${CROSS_COMPILE}gcc{$CROSS_COMPILE_POSTFIX} - CXX = ${CROSS_COMPILE}g++{$CROSS_COMPILE_POSTFIX} - AR = ${CROSS_COMPILE}ar{$CROSS_COMPILE_POSTFIX} - else - CC = ${CROSS_COMPILE}gcc - CXX = ${CROSS_COMPILE}g++ - AR = ${CROSS_COMPILE}ar - endif + CC = ${CROSS_COMPILE}gcc${CROSS_COMPILE_SUFFIX} + CXX = ${CROSS_COMPILE}g++${CROSS_COMPILE_SUFFIX} + AR = ${CROSS_COMPILE}ar${CROSS_COMPILE_SUFFIX} # Cross-linker requires this for linked in shared libs that depend # themselves on other shared libs (not directly linked in) LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib -- cgit v1.2.1 From 411929ec7d2550f289eb1a2f045f2fc6651cb002 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 24 Aug 2016 15:40:44 -0500 Subject: *_SINGLETON_DECLARE needs to appear in .cpp files, not .h. This prevents multiple definition of typeinfo symbols during linking, only seen on arm-linux-gnueabihf-g++ but the code is invalid C++ on all platforms. --- ACE/ace/Based_Pointer_Repository.cpp | 3 +++ ACE/ace/Based_Pointer_Repository.h | 5 ----- ACE/ace/UUID.cpp | 2 ++ ACE/ace/UUID.h | 2 -- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 2 ++ TAO/orbsvcs/orbsvcs/AV/AV_Core.h | 2 -- TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp | 2 ++ TAO/orbsvcs/tests/Notify/lib/LookupManager.h | 2 -- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp index 6ec16f555ca..75727e234a8 100644 --- a/ACE/ace/Based_Pointer_Repository.cpp +++ b/ACE/ace/Based_Pointer_Repository.cpp @@ -119,5 +119,8 @@ ACE_Based_Pointer_Repository::unbind (void *addr) ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX); +ACE_SINGLETON_DECLARE (ACE_Singleton, + ACE_Based_Pointer_Repository, + ACE_SYNCH_RW_MUTEX) ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h index 00b6d2c4f6b..1dbb5a20ac1 100644 --- a/ACE/ace/Based_Pointer_Repository.h +++ b/ACE/ace/Based_Pointer_Repository.h @@ -76,11 +76,6 @@ private: // ---------------------------------- -/// Declare a process wide singleton -ACE_SINGLETON_DECLARE (ACE_Singleton, - ACE_Based_Pointer_Repository, - ACE_SYNCH_RW_MUTEX) - /// Provide a Singleton access point to the based pointer repository. typedef ACE_Singleton ACE_BASED_POINTER_REPOSITORY; diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp index dbac895fb8a..5a97c584b04 100644 --- a/ACE/ace/UUID.cpp +++ b/ACE/ace/UUID.cpp @@ -15,6 +15,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX) + namespace ACE_Utils { // NIL version of the UUID diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h index 1e9671214d1..b2308aae9d7 100644 --- a/ACE/ace/UUID.h +++ b/ACE/ace/UUID.h @@ -275,8 +275,6 @@ namespace ACE_Utils UUID_GENERATOR; } -ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX) - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 5c6b24a29bc..0501c79730a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1150,4 +1150,6 @@ TAO_AV_Core::get_control_flowname(const char *flowname) template ACE_Singleton *ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) + TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 4fea5b533cf..98a0ab923e7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -162,8 +162,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) - typedef ACE_Singleton TAO_AV_CORE; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index f78102f88ef..0ab38637907 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -222,3 +222,5 @@ TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filte #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton *ACE_Singleton::singleton_; #endif /*ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ + +TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX) diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h index 6b1db928a77..5d86943f979 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h @@ -105,8 +105,6 @@ protected: TAO_Notify_Tests_Priority_Mapping *priority_mapping_; }; -TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX) - typedef ACE_Singleton _TAO_Notify_Tests_LookupManager; #define LOOKUP_MANAGER _TAO_Notify_Tests_LookupManager::instance() -- cgit v1.2.1 From 62cc01c2cc61f0da9618056e825274ec481a7686 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 24 Aug 2016 17:17:26 -0500 Subject: Updated previous change to TAO_AV_Core for versioned namespaces --- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 0501c79730a..d8c88f9c8e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1150,6 +1150,10 @@ TAO_AV_Core::get_control_flowname(const char *flowname) template ACE_Singleton *ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) -TAO_END_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 068b86554f9954b3270d6e263adbc817c6b733fa Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 31 Aug 2016 11:48:02 +0200 Subject: Documentation changes --- TAO/examples/Callback_Quoter/Consumer_Input_Handler.h | 2 +- TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp | 1 - TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp | 2 +- TAO/orbsvcs/Naming_Service/README | 2 -- TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h | 14 +++++++------- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h index b33918cc7e5..883673c2251 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h @@ -63,7 +63,7 @@ public: // // = DESCRIPTION // Used so that the process of registering, unregistering - // and exitting neednt be dependent on 'r' 'u' and 'q'. + // and exiting neednt be dependent on 'r' 'u' and 'q'. // Also, #define clutters up the global namespace. REGISTER = 'r', diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index 6b557d5780e..fe908ddb630 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -11,7 +11,6 @@ */ //============================================================================= - #include "orbsvcs/Log_Macros.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index c2adf6a50d9..1887780411e 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -264,7 +264,7 @@ TAO_NT_Naming_Service::svc (void) } catch (const CORBA::Exception& ex) { - ORBSVCS_DEBUG ((LM_INFO, "Exception in service - exitting\n")); + ORBSVCS_DEBUG ((LM_INFO, "Exception in service - exiting\n")); ex._tao_print_exception ("TAO NT Naming Service"); return -1; } diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README index 401ca1d417e..cd79e15c245 100644 --- a/TAO/orbsvcs/Naming_Service/README +++ b/TAO/orbsvcs/Naming_Service/README @@ -1,5 +1,3 @@ - - This directory contains files that implement a server for the TAO Naming Service. In addition, it contains files that run the TAO Naming Service as a Windows NT Service. Both of these services are diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index df45c4f337b..d0c3f2ffbc3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -43,8 +43,8 @@ public: /// Constructor. TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb); - /// Allocate hash map of size from persistent storage - /// using the . + /// Allocate hash map of size @a hash_map_size from persistent storage + /// using the @a alloc. int open (size_t hash_map_size, ACE_Allocator *alloc); @@ -81,7 +81,7 @@ public: /** * Add a binding with the specified parameters to the table. * Return 0 on success and -1 on failure, 1 if there already is a - * binding with and . + * binding with @a id and @a kind. */ virtual int bind (const char *id, const char *kind, @@ -89,7 +89,7 @@ public: CosNaming::BindingType type); /** - * Overwrite a binding containing and (or create a new + * Overwrite a binding containing @a id and @a kind (or create a new * one if one doesn't exist) with the specified parameters. Return * 0 or 1 on success. Return -1 or -2 on failure. (-2 is returned * if the new and old bindings differ in type). @@ -210,10 +210,10 @@ public: virtual CosNaming::NamingContext_ptr new_context (void); /** - * Returns at most the requested number of bindings in - * . If the naming context contains additional bindings, they + * Returns at most the requested number of bindings @a how_many in + * @a bl. If the naming context contains additional bindings, they * are returned with a BindingIterator. In the naming context does - * not contain any additional bindings returned as null. + * not contain any additional bindings @a bi returned as null. */ virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, -- cgit v1.2.1 From fe1f3dfb843c1480f0b9639efacf36be64bc0a4d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 2 Sep 2016 19:44:41 +0200 Subject: Documentation changes * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h: * TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h: * TAO/orbsvcs/orbsvcs/Notify/Properties.h: --- TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h | 6 +++--- TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h | 8 ++++---- TAO/orbsvcs/orbsvcs/Notify/Properties.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index dce55502484..d46187a2908 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -108,12 +108,12 @@ public: /** * Create an entry for a Persistent Naming Context in , - * i.e., a context with , and has just + * i.e., a context with @a poa_id, @A counter and @A hash_map has just * been created, and is registering with us. */ int bind (const char *poa_id, ACE_UINT32 *&counter, CONTEXT *hash_map); - /// Remove an entry for the Persistent Naming Context with + /// Remove an entry for the Persistent Naming Context with @a poa_id /// from (i.e., this context has just been destroyed). int unbind (const char *poa_id); @@ -163,7 +163,7 @@ private: /// Base address for the memory-mapped file. void *base_address_; - /// ORB. We use it for several object_to_string conversions, and + /// ORB. We use it for several object_to_string conversions, and /// keep it around for Persistent Naming Contexts' use. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index a0ed5c22948..47a45979bbc 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -70,7 +70,7 @@ public: * @class TAO_Persistent_ExtId * * @brief Helper class for TAO_Persistent_Bindings_Map: unifies several - * data items, so they can be stored together as a + * data items, so they can be stored together as a * for a in a hash table holding the state of a Persistent * Naming Context. * @@ -109,17 +109,17 @@ public: /// Inequality comparison operator. bool operator!= (const TAO_Persistent_ExtId &rhs) const; - /// function is required in order for this class to be usable by + /// hash() function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. u_long hash (void) const; // = Data members. - /// portion of the name to be associated with some object + /// id portion of the name to be associated with some object /// reference in a Persistent Naming Context. const char * id_; - /// portion of the name to be associated with some object + /// kind portion of the name to be associated with some object /// reference in a Persistent Naming Context. const char * kind_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index b19b9439e09..8b7738439c5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -33,7 +33,7 @@ class TAO_Notify_Builder; /** * @class TAO_Notify_Properties * - * @brief Global properties that strategize Notify's run-time behaviour. + * @brief Global properties that strategize Notify's run-time behavior. */ class TAO_Notify_Serv_Export TAO_Notify_Properties { -- cgit v1.2.1 From d1463d5340978fac91d662c8518a40aee1430721 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 2 Sep 2016 19:44:53 +0200 Subject: Initialise pointer with 0 * TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp: --- TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 0e0ca240abc..d911c4b2b2d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -25,7 +25,7 @@ void TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer) { // Convert Consumer to Base Type - TAO_Notify_PushConsumer* consumer; + TAO_Notify_PushConsumer* consumer = 0; ACE_NEW_THROW_EX (consumer, TAO_Notify_PushConsumer (this), CORBA::NO_MEMORY ()); -- cgit v1.2.1 From 1004be5609bb7842835d865422c65332d08425ee Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 2 Sep 2016 20:52:39 +0200 Subject: Revert "Updated previous change to TAO_AV_Core for versioned namespaces" This reverts commit 62cc01c2cc61f0da9618056e825274ec481a7686. --- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index d8c88f9c8e4..0501c79730a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1150,10 +1150,6 @@ TAO_AV_Core::get_control_flowname(const char *flowname) template ACE_Singleton *ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) -ACE_END_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 03ef5706e8b3dcdd8de7636f39aaca7543b23283 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 2 Sep 2016 20:53:02 +0200 Subject: Revert "*_SINGLETON_DECLARE needs to appear in .cpp files, not .h." This reverts commit 411929ec7d2550f289eb1a2f045f2fc6651cb002. --- ACE/ace/Based_Pointer_Repository.cpp | 3 --- ACE/ace/Based_Pointer_Repository.h | 5 +++++ ACE/ace/UUID.cpp | 2 -- ACE/ace/UUID.h | 2 ++ TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 2 -- TAO/orbsvcs/orbsvcs/AV/AV_Core.h | 2 ++ TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp | 2 -- TAO/orbsvcs/tests/Notify/lib/LookupManager.h | 2 ++ 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp index 75727e234a8..6ec16f555ca 100644 --- a/ACE/ace/Based_Pointer_Repository.cpp +++ b/ACE/ace/Based_Pointer_Repository.cpp @@ -119,8 +119,5 @@ ACE_Based_Pointer_Repository::unbind (void *addr) ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX); -ACE_SINGLETON_DECLARE (ACE_Singleton, - ACE_Based_Pointer_Repository, - ACE_SYNCH_RW_MUTEX) ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h index 1dbb5a20ac1..00b6d2c4f6b 100644 --- a/ACE/ace/Based_Pointer_Repository.h +++ b/ACE/ace/Based_Pointer_Repository.h @@ -76,6 +76,11 @@ private: // ---------------------------------- +/// Declare a process wide singleton +ACE_SINGLETON_DECLARE (ACE_Singleton, + ACE_Based_Pointer_Repository, + ACE_SYNCH_RW_MUTEX) + /// Provide a Singleton access point to the based pointer repository. typedef ACE_Singleton ACE_BASED_POINTER_REPOSITORY; diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp index 5a97c584b04..dbac895fb8a 100644 --- a/ACE/ace/UUID.cpp +++ b/ACE/ace/UUID.cpp @@ -15,8 +15,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX) - namespace ACE_Utils { // NIL version of the UUID diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h index b2308aae9d7..1e9671214d1 100644 --- a/ACE/ace/UUID.h +++ b/ACE/ace/UUID.h @@ -275,6 +275,8 @@ namespace ACE_Utils UUID_GENERATOR; } +ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX) + ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 0501c79730a..5c6b24a29bc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1150,6 +1150,4 @@ TAO_AV_Core::get_control_flowname(const char *flowname) template ACE_Singleton *ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ -TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 98a0ab923e7..4fea5b533cf 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -162,6 +162,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) + typedef ACE_Singleton TAO_AV_CORE; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index 0ab38637907..f78102f88ef 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -222,5 +222,3 @@ TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filte #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton *ACE_Singleton::singleton_; #endif /*ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ - -TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX) diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h index 5d86943f979..6b1db928a77 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h @@ -105,6 +105,8 @@ protected: TAO_Notify_Tests_Priority_Mapping *priority_mapping_; }; +TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX) + typedef ACE_Singleton _TAO_Notify_Tests_LookupManager; #define LOOKUP_MANAGER _TAO_Notify_Tests_LookupManager::instance() -- cgit v1.2.1 From 044091d7873086e1ecd54808e7652e9ae0025d31 Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Sat, 3 Sep 2016 00:31:11 +0300 Subject: Readded ACE_STD_NAMESPACE:: --- ACE/ace/OS_NS_stdlib.h | 2 +- ACE/ace/OS_NS_time.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index a6ffa8eb4f4..95e65410297 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -83,7 +83,7 @@ inline int ace_rand_r_helper (unsigned *seed) return rand_r (seed); #undef rand_r #else - return ::rand_r (seed); + return ACE_STD_NAMESPACE::rand_r (seed); #endif /* rand_r */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index f995fdd46b1..013276eb00a 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -102,7 +102,7 @@ inline char *ace_asctime_r_helper (const struct tm *t, char *buf) return asctime_r (t, buf); #undef asctime_r #else - return ::asctime_r (t, buf); + return ACE_STD_NAMESPACE::asctime_r (t, buf); #endif /* defined (asctime_r) */ } @@ -112,7 +112,7 @@ inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) return gmtime_r (clock, res); #undef gmtime_r #else - return ::gmtime_r (clock, res); + return ACE_STD_NAMESPACE::gmtime_r (clock, res); #endif /* defined (gmtime_r) */ } @@ -122,7 +122,7 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) return localtime_r (clock, res); #undef localtime_r #else - return ::localtime_r (clock, res); + return ACE_STD_NAMESPACE::localtime_r (clock, res); #endif /* defined (localtime_r) */ } -- cgit v1.2.1 From 7c3da81689d2b47e71b60d36533cf0116565d72e Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Sat, 3 Sep 2016 08:35:59 +0300 Subject: Handle platforms that lack reentrant functions --- ACE/ace/OS_NS_stdlib.h | 10 ++++++---- ACE/ace/OS_NS_time.h | 30 ++++++++++++++++++------------ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 95e65410297..6d5d0baf642 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -77,15 +77,17 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) } #endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ +#if !defined (ACE_LACKS_RAND_R) inline int ace_rand_r_helper (unsigned *seed) { -#if defined (rand_r) +# if defined (rand_r) return rand_r (seed); -#undef rand_r -#else +# undef rand_r +# else return ACE_STD_NAMESPACE::rand_r (seed); -#endif /* rand_r */ +# endif /* rand_r */ } +#endif /* !ACE_LACKS_RAND_R */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 013276eb00a..dec111def52 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -96,35 +96,41 @@ inline long ace_timezone() * be usable later as there is no way to save the macro definition * using the pre-processor. */ +#if !defined (ACE_LACKS_ASCTIME_R) inline char *ace_asctime_r_helper (const struct tm *t, char *buf) { -#if defined (asctime_r) +# if defined (asctime_r) return asctime_r (t, buf); -#undef asctime_r -#else +# undef asctime_r +# else return ACE_STD_NAMESPACE::asctime_r (t, buf); -#endif /* defined (asctime_r) */ +# endif /* asctime_r */ } +#endif /* !ACE_LACKS_ASCTIME_R */ +#if !defined (ACE_LACKS_GMTIME_R) inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) { -#if defined (gmtime_r) +# if defined (gmtime_r) return gmtime_r (clock, res); -#undef gmtime_r -#else +# undef gmtime_r +# else return ACE_STD_NAMESPACE::gmtime_r (clock, res); -#endif /* defined (gmtime_r) */ +# endif /* gmtime_r */ } +#endif /* !ACE_LACKS_GMTIME_R */ +#if !defined (ACE_LACKS_LOCALTIME_R) inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) { -#if defined (localtime_r) +# if defined (localtime_r) return localtime_r (clock, res); -#undef localtime_r -#else +# undef localtime_r +# else return ACE_STD_NAMESPACE::localtime_r (clock, res); -#endif /* defined (localtime_r) */ +# endif /* localtime_r */ } +#endif /* !ACE_LACKS_LOCALTIME_R */ #if !defined (ACE_LACKS_DIFFTIME) # if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ -- cgit v1.2.1 From c4f77c4178fbd6546342ddf55a2ffc92af91729c Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Sat, 3 Sep 2016 14:55:28 +0300 Subject: Added a check for ACE_HAS_TR24731_2005_CRT --- ACE/ace/OS_NS_time.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index dec111def52..4fddbdb1571 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -96,7 +96,7 @@ inline long ace_timezone() * be usable later as there is no way to save the macro definition * using the pre-processor. */ -#if !defined (ACE_LACKS_ASCTIME_R) +#if !defined (ACE_LACKS_ASCTIME_R) && !defined (ACE_HAS_TR24731_2005_CRT) inline char *ace_asctime_r_helper (const struct tm *t, char *buf) { # if defined (asctime_r) @@ -106,9 +106,9 @@ inline char *ace_asctime_r_helper (const struct tm *t, char *buf) return ACE_STD_NAMESPACE::asctime_r (t, buf); # endif /* asctime_r */ } -#endif /* !ACE_LACKS_ASCTIME_R */ +#endif /* !ACE_LACKS_ASCTIME_R && !ACE_HAS_TR24731_2005_CRT */ -#if !defined (ACE_LACKS_GMTIME_R) +#if !defined (ACE_LACKS_GMTIME_R) && !defined (ACE_HAS_TR24731_2005_CRT) inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) { # if defined (gmtime_r) @@ -118,9 +118,9 @@ inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) return ACE_STD_NAMESPACE::gmtime_r (clock, res); # endif /* gmtime_r */ } -#endif /* !ACE_LACKS_GMTIME_R */ +#endif /* !ACE_LACKS_GMTIME_R && !ACE_HAS_TR24731_2005_CRT */ -#if !defined (ACE_LACKS_LOCALTIME_R) +#if !defined (ACE_LACKS_LOCALTIME_R) && !defined (ACE_HAS_TR24731_2005_CRT) inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) { # if defined (localtime_r) @@ -130,7 +130,7 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) return ACE_STD_NAMESPACE::localtime_r (clock, res); # endif /* localtime_r */ } -#endif /* !ACE_LACKS_LOCALTIME_R */ +#endif /* !ACE_LACKS_LOCALTIME_R && !ACE_HAS_TR24731_2005_CRT */ #if !defined (ACE_LACKS_DIFFTIME) # if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ -- cgit v1.2.1 From f3387d02b2617c272300f22f2ae7a5864065997f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 4 Sep 2016 19:20:58 +0200 Subject: Fixed warning * TAO/utils/logWalker/Invocation.cpp: --- TAO/utils/logWalker/Invocation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index f517c936c2e..e7d4ac18dd4 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -457,7 +457,7 @@ Invocation::dump_detail (ostream &strm, for (NotifyIncidents::ITERATOR i = this->notify_incidents_.begin(); !(i.done()); i.advance()) { - ACE_CString *note; + ACE_CString *note = 0; i.next(note); strm << " " << *note << endl; } -- cgit v1.2.1 From 4309725bbebeb3fb6027766915fd2f6922f54eea Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 5 Sep 2016 09:32:25 +0200 Subject: Revert "Handle system functions that may be defined as macros on some platforms" --- ACE/ace/OS_NS_stdlib.h | 12 ------------ ACE/ace/OS_NS_stdlib.inl | 2 +- ACE/ace/OS_NS_time.cpp | 2 +- ACE/ace/OS_NS_time.h | 41 ----------------------------------------- ACE/ace/OS_NS_time.inl | 4 ++-- 5 files changed, 4 insertions(+), 57 deletions(-) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 6d5d0baf642..c7b89a06fc3 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -77,18 +77,6 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) } #endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ -#if !defined (ACE_LACKS_RAND_R) -inline int ace_rand_r_helper (unsigned *seed) -{ -# if defined (rand_r) - return rand_r (seed); -# undef rand_r -# else - return ACE_STD_NAMESPACE::rand_r (seed); -# endif /* rand_r */ -} -#endif /* !ACE_LACKS_RAND_R */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index cb59874b3cf..2c0f4c36991 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -431,7 +431,7 @@ ACE_OS::rand_r (unsigned int *seed) *seed = (unsigned int)new_seed; return (int) (new_seed & RAND_MAX); #else - return ace_rand_r_helper (seed); + return ::rand_r (seed); # endif /* ACE_LACKS_RAND_R */ } diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 2ab3c7ebe47..3d4fcc93d47 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -287,7 +287,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) return res; } #else - return ace_localtime_r_helper (t, res); + ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0); #endif /* ACE_HAS_TR24731_2005_CRT */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 4fddbdb1571..11d226ea28b 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -90,47 +90,6 @@ inline long ace_timezone() #endif } -/* - * We inline and undef some functions that may be implemented - * as macros on some platforms. This way macro definitions will - * be usable later as there is no way to save the macro definition - * using the pre-processor. - */ -#if !defined (ACE_LACKS_ASCTIME_R) && !defined (ACE_HAS_TR24731_2005_CRT) -inline char *ace_asctime_r_helper (const struct tm *t, char *buf) -{ -# if defined (asctime_r) - return asctime_r (t, buf); -# undef asctime_r -# else - return ACE_STD_NAMESPACE::asctime_r (t, buf); -# endif /* asctime_r */ -} -#endif /* !ACE_LACKS_ASCTIME_R && !ACE_HAS_TR24731_2005_CRT */ - -#if !defined (ACE_LACKS_GMTIME_R) && !defined (ACE_HAS_TR24731_2005_CRT) -inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) -{ -# if defined (gmtime_r) - return gmtime_r (clock, res); -# undef gmtime_r -# else - return ACE_STD_NAMESPACE::gmtime_r (clock, res); -# endif /* gmtime_r */ -} -#endif /* !ACE_LACKS_GMTIME_R && !ACE_HAS_TR24731_2005_CRT */ - -#if !defined (ACE_LACKS_LOCALTIME_R) && !defined (ACE_HAS_TR24731_2005_CRT) -inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) -{ -# if defined (localtime_r) - return localtime_r (clock, res); -# undef localtime_r -# else - return ACE_STD_NAMESPACE::localtime_r (clock, res); -# endif /* localtime_r */ -} -#endif /* !ACE_LACKS_LOCALTIME_R && !ACE_HAS_TR24731_2005_CRT */ #if !defined (ACE_LACKS_DIFFTIME) # if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index f066be30b60..c821530bc82 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -26,7 +26,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) #if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) char *result = 0; - ace_asctime_r_helper (t, buf); + ACE_OSCALL (::asctime_r (t, buf), char *, 0, result); ACE_OS::strsncpy (buf, result, buflen); return buf; # else @@ -375,7 +375,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) { ACE_OS_TRACE ("ACE_OS::gmtime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) - return ace_gmtime_r_helper (t, res); + ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0); #elif defined (ACE_HAS_TR24731_2005_CRT) struct tm *tm_p = res; ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p); -- cgit v1.2.1 From 4f764038b40398a3568dd112518521ef630ff6dd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 5 Sep 2016 13:57:41 +0200 Subject: Added versioned build * .travis.yml: --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5c51f004baf..a32bc2f3856 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: - CCMNOEVENT=1 ACEFORTAO=0 - ACETESTS=1 ACEFORTAO=0 - USES_WCHAR=1 + - VERSIONED=1 global: - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO @@ -43,6 +44,7 @@ before_script: - if [ "$CCMLW" == "1" ]; then echo -e "ccm_lw=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi + - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst -- cgit v1.2.1 From bc841d6bb68196f65d0286bd118af7fe3b67efdc Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 8 Sep 2016 12:13:24 +0200 Subject: Use stati65 with MinGW * ACE/ace/OS_NS_sys_stat.h: --- ACE/ace/OS_NS_sys_stat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index ed9ce01ba87..586d978331d 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -57,6 +57,10 @@ typedef struct _stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 # define ACE_WSTAT_FUNC_NAME ::_wstati64 # endif /* _MSC_VER >= 1400 */ +# elif defined (__MINGW32__) +typedef struct _stati64 ACE_stat; +# define ACE_STAT_FUNC_NAME ::_stati64 +# define ACE_WSTAT_FUNC_NAME ::_wstati64 # else typedef struct stat ACE_stat; # define ACE_STAT_FUNC_NAME ::stat -- cgit v1.2.1 From c982c07989a3286e0f91705f0583b1ffad2dcda0 Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Fri, 9 Sep 2016 17:47:40 +0300 Subject: Take 2: Handle system functions that may be defined as macros on some platforms --- ACE/ace/OS_NS_stdlib.h | 12 ++++++++++++ ACE/ace/OS_NS_stdlib.inl | 2 +- ACE/ace/OS_NS_time.cpp | 2 +- ACE/ace/OS_NS_time.h | 41 +++++++++++++++++++++++++++++++++++++++++ ACE/ace/OS_NS_time.inl | 4 ++-- ACE/ace/config-win32-borland.h | 2 ++ ACE/ace/config-win32-mingw.h | 2 ++ ACE/ace/config-win32-mingw64.h | 2 ++ ACE/ace/config-win32-msvc-7.h | 2 ++ 9 files changed, 65 insertions(+), 4 deletions(-) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index c7b89a06fc3..6d5d0baf642 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -77,6 +77,18 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) } #endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ +#if !defined (ACE_LACKS_RAND_R) +inline int ace_rand_r_helper (unsigned *seed) +{ +# if defined (rand_r) + return rand_r (seed); +# undef rand_r +# else + return ACE_STD_NAMESPACE::rand_r (seed); +# endif /* rand_r */ +} +#endif /* !ACE_LACKS_RAND_R */ + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 2c0f4c36991..cb59874b3cf 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -431,7 +431,7 @@ ACE_OS::rand_r (unsigned int *seed) *seed = (unsigned int)new_seed; return (int) (new_seed & RAND_MAX); #else - return ::rand_r (seed); + return ace_rand_r_helper (seed); # endif /* ACE_LACKS_RAND_R */ } diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 3d4fcc93d47..2ab3c7ebe47 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -287,7 +287,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) return res; } #else - ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0); + return ace_localtime_r_helper (t, res); #endif /* ACE_HAS_TR24731_2005_CRT */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 11d226ea28b..dec111def52 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -90,6 +90,47 @@ inline long ace_timezone() #endif } +/* + * We inline and undef some functions that may be implemented + * as macros on some platforms. This way macro definitions will + * be usable later as there is no way to save the macro definition + * using the pre-processor. + */ +#if !defined (ACE_LACKS_ASCTIME_R) +inline char *ace_asctime_r_helper (const struct tm *t, char *buf) +{ +# if defined (asctime_r) + return asctime_r (t, buf); +# undef asctime_r +# else + return ACE_STD_NAMESPACE::asctime_r (t, buf); +# endif /* asctime_r */ +} +#endif /* !ACE_LACKS_ASCTIME_R */ + +#if !defined (ACE_LACKS_GMTIME_R) +inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) +{ +# if defined (gmtime_r) + return gmtime_r (clock, res); +# undef gmtime_r +# else + return ACE_STD_NAMESPACE::gmtime_r (clock, res); +# endif /* gmtime_r */ +} +#endif /* !ACE_LACKS_GMTIME_R */ + +#if !defined (ACE_LACKS_LOCALTIME_R) +inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) +{ +# if defined (localtime_r) + return localtime_r (clock, res); +# undef localtime_r +# else + return ACE_STD_NAMESPACE::localtime_r (clock, res); +# endif /* localtime_r */ +} +#endif /* !ACE_LACKS_LOCALTIME_R */ #if !defined (ACE_LACKS_DIFFTIME) # if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index c821530bc82..f066be30b60 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -26,7 +26,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) #if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) char *result = 0; - ACE_OSCALL (::asctime_r (t, buf), char *, 0, result); + ace_asctime_r_helper (t, buf); ACE_OS::strsncpy (buf, result, buflen); return buf; # else @@ -375,7 +375,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) { ACE_OS_TRACE ("ACE_OS::gmtime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) - ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0); + return ace_gmtime_r_helper (t, res); #elif defined (ACE_HAS_TR24731_2005_CRT) struct tm *tm_p = res; ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p); diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 316dcb26333..bae65845d21 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -154,6 +154,8 @@ #if (__BORLANDC__ <= 0x680) # define ACE_LACKS_LOCALTIME_R +# define ACE_LACKS_GMTIME_R +# define ACE_LACKS_ASCTIME_R #endif #define ACE_WCSDUP_EQUIVALENT ::_wcsdup diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index 36b61cf48cc..63a78386938 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -87,6 +87,8 @@ #define ACE_LACKS_PDHMSG_H #define ACE_LACKS_STRTOK_R #define ACE_LACKS_LOCALTIME_R +#define ACE_LACKS_GMTIME_R +#define ACE_LACKS_ASCTIME_R #define ACE_HAS_NONCONST_WCSDUP #define ACE_HAS_WINSOCK2_GQOS #define ACE_ISCTYPE_EQUIVALENT ::_isctype diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index 939b2663d37..e62150b5bc8 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -122,6 +122,8 @@ #define ACE_LACKS_PDHMSG_H #define ACE_LACKS_STRTOK_R #define ACE_LACKS_LOCALTIME_R +#define ACE_LACKS_GMTIME_R +#define ACE_LACKS_ASCTIME_R #define ACE_HAS_NONCONST_WCSDUP #define ACE_ISCTYPE_EQUIVALENT ::_isctype diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h index 7aac881e6ec..3b4858a4984 100644 --- a/ACE/ace/config-win32-msvc-7.h +++ b/ACE/ace/config-win32-msvc-7.h @@ -48,6 +48,8 @@ #define ACE_LACKS_STRTOK_R #define ACE_LACKS_LOCALTIME_R +#define ACE_LACKS_GMTIME_R +#define ACE_LACKS_ASCTIME_R #define ACE_HAS_SIG_ATOMIC_T #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -- cgit v1.2.1 From f4bfd1ca023c8ea58aa3ca4147ff883b12ecde37 Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Fri, 9 Sep 2016 18:07:48 +0300 Subject: Moved ACE_LACKS_xxxTIME_R defines to config-win32-msvc.h --- ACE/ace/config-win32-msvc-7.h | 3 --- ACE/ace/config-win32-msvc.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h index 3b4858a4984..9db4d39204b 100644 --- a/ACE/ace/config-win32-msvc-7.h +++ b/ACE/ace/config-win32-msvc-7.h @@ -47,9 +47,6 @@ #define ACE_LACKS_STRPTIME #define ACE_LACKS_STRTOK_R -#define ACE_LACKS_LOCALTIME_R -#define ACE_LACKS_GMTIME_R -#define ACE_LACKS_ASCTIME_R #define ACE_HAS_SIG_ATOMIC_T #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 7b4c7e6b9ee..65973367530 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -125,6 +125,10 @@ #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_REGEX_H +#define ACE_LACKS_LOCALTIME_R +#define ACE_LACKS_GMTIME_R +#define ACE_LACKS_ASCTIME_R + #define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" #define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" -- cgit v1.2.1 From e24061216228b5ead1ea90e3e9d0d4df8df8b8f4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 11 Sep 2016 11:02:43 +0200 Subject: Use std::abs instead of abs * ACE/ace/Time_Value.cpp: --- ACE/ace/Time_Value.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index b390d815bc4..0cad794c554 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -18,6 +18,8 @@ # include #endif /* ACE_HAS_CPP98_IOSTREAMS */ +#include + #ifdef ACE_HAS_CPP11 # include #endif /* ACE_HAS_CPP11 */ @@ -178,7 +180,7 @@ ACE_Time_Value::normalize (bool saturate) if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS || this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) { - time_t sec = abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); + time_t sec = std::abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); suseconds_t usec = this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS; if (saturate && this->tv_.tv_sec > 0 && sec > 0 && -- cgit v1.2.1 From 8e8a781442a5ae5e4938a469ac5e8df91f3707bd Mon Sep 17 00:00:00 2001 From: David Lifshitz Date: Tue, 2 Aug 2016 16:30:12 -0400 Subject: BZ-4216 Android build fails when not cross-compiled on Linux [Changed] platform_android.GNU - removed extra comment and include --- ACE/include/makeinclude/platform_android.GNU | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 2bbbbe19259..756ba7e2d03 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -9,11 +9,6 @@ no_hidden_visibility ?= 1 # as of NDK r6 inlining is required inline ?= 1 -# start of: include most of platform_linux_common.GNU - -# We always include config-linux.h on Linux platforms. -ACE_PLATFORM_CONFIG ?= config-linux.h - debug ?= 1 optimize ?= 1 threads ?= 1 @@ -125,6 +120,11 @@ AR ?= ar ARFLAGS ?= rsuv RANLIB = @true +PIC = -fPIC +AR ?= ar +ARFLAGS ?= rsuv +RANLIB = @true + # end of: include most of platform_linux_common.GNU #No rwho on Android -- cgit v1.2.1 From 5382791dbaa61a859cc4b8e6746b86c183d4f5b3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 11:01:35 +0200 Subject: Initialise value with 0 to fix Coverity error * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp: --- TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index 4f1d5283b33..6c462bea6fa 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -1450,7 +1450,7 @@ Admin_Client::union_test (void) CORBA::Any_var label = tc->member_label (i); TAO_InputCDR cdr (static_cast (0)); - CORBA::ULong val; + CORBA::ULong val = 0; TAO::Any_Impl *impl = label->impl (); TAO_OutputCDR out; -- cgit v1.2.1 From ac6416f590563684d6ba660ddb89bd13c0842c70 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 11:02:02 +0200 Subject: Use own_factory_ at the moment to cleanup to delete the factory at the moment we own it at destruction, fixes coverity errors * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp: --- TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index 9747d1b82e9..d0c5572b99e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -46,7 +46,7 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) { // Destroy Strategies in the reverse order of creation, they - // refere to each other during destruction and thus need to be + // reference to each other during destruction and thus need to be // cleaned up properly. this->factory_->destroy_supplier_control (this->supplier_control_); this->supplier_control_ = 0; @@ -76,7 +76,7 @@ TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) this->factory_->destroy_dispatching (this->dispatching_); this->dispatching_ = 0; - this->factory (0, 0); + this->factory (0, this->own_factory_); } void -- cgit v1.2.1 From 851196b5e70421cd62c16e47ccd3863591ffa8c7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 11:13:08 +0200 Subject: Fixed reported memory leak by Coverity * ACE/tests/Compiler_Features_21_Test.cpp: --- ACE/tests/Compiler_Features_21_Test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ACE/tests/Compiler_Features_21_Test.cpp b/ACE/tests/Compiler_Features_21_Test.cpp index 13d3b369614..c8ad796e3a7 100644 --- a/ACE/tests/Compiler_Features_21_Test.cpp +++ b/ACE/tests/Compiler_Features_21_Test.cpp @@ -17,6 +17,7 @@ struct A struct B { B() : b(new A[0]) {} + ~B() { delete [] b; } A *b; }; -- cgit v1.2.1 From 5f217dc03ff7bb574f281056b2d526b50863d65b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 11:23:37 +0200 Subject: Fixed memory leaks reported by Coverity * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp: * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: --- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 11 ++++++++--- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 14 ++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 16a84eebf61..98c3f7bf520 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -651,9 +651,14 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, - "\n(%P|%t)stream_endpoint_b_ = %s", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()))); + if (TAO_debug_level > 0) + { + CORBA::String_var ep = TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()); + ORBSVCS_DEBUG ((LM_DEBUG, + "\n(%P|%t)stream_endpoint_b_ = <%C>", + ep.in ())); + } + // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 4b09591dea5..882a2d742a3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Endpoint_Strategy.cpp @@ -7,7 +6,6 @@ */ //============================================================================= - #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/Endpoint_Strategy.h" @@ -17,8 +15,6 @@ #include "ace/Process_Semaphore.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------------- @@ -33,7 +29,6 @@ TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void) // Destructor. TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) { - } // The base class defines the "failure" case, so that unless the @@ -62,7 +57,6 @@ TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_ -1); } - // ---------------------------------------------------------------------- // TAO_AV_Endpoint_Process_Strategy // ---------------------------------------------------------------------- @@ -339,8 +333,12 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s "(%P|%t) TAO_AV_Endpoint_Process_Strategy: Error in activate ()\n"), -1); - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()))); + if (TAO_debug_level > 0) + { + CORBA::String_var ep = TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()); + ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is: <%C>\n", + ep.in ())); + } stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); } -- cgit v1.2.1 From 4ebc48ab2088bb536b3810db372b830415bbe74c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 11:36:02 +0200 Subject: Don't delete the member of the base in ACEXML_SAXNotSupportedException, the base class destructor already handles that * ACE/ACEXML/common/SAXExceptions.cpp: --- ACE/ACEXML/common/SAXExceptions.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp index 7c9e575e321..e03ef586091 100644 --- a/ACE/ACEXML/common/SAXExceptions.cpp +++ b/ACE/ACEXML/common/SAXExceptions.cpp @@ -111,7 +111,6 @@ ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_C ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void) { - delete[] this->message_; } -- cgit v1.2.1 From 06b6bea83df9722ada3a0972db825de7750eaf33 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 15:17:01 +0200 Subject: Fixed coverity reported issues * ACE/ACEXML/common/Mem_Map_Stream.cpp: * ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp: * ACE/ACEXML/examples/SAXPrint/Print_Handler.h: --- ACE/ACEXML/common/Mem_Map_Stream.cpp | 8 ++++---- ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp | 22 ++-------------------- ACE/ACEXML/examples/SAXPrint/Print_Handler.h | 2 -- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ACE/ACEXML/common/Mem_Map_Stream.cpp b/ACE/ACEXML/common/Mem_Map_Stream.cpp index df21523d97a..66a065055ab 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.cpp +++ b/ACE/ACEXML/common/Mem_Map_Stream.cpp @@ -4,12 +4,12 @@ #include "ACEXML/common/Mem_Map_Stream.h" - - ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void) - : svc_handler_ (0) + : svc_handler_ (0), + recv_pos_ (0), + get_pos_ (0), + end_of_mapping_plus1_ (0) { - } ACE_SOCK_Stream & diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp index 73a295fcdc8..8b6ccdc374d 100644 --- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp +++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp @@ -5,9 +5,9 @@ #include "ace/Log_Msg.h" ACEXML_Print_Handler::ACEXML_Print_Handler (ACEXML_Char* fileName) - : fileName_(ACE::strnew (fileName)) + : fileName_(ACE::strnew (fileName)), + locator_ (0) { - } ACEXML_Print_Handler::~ACEXML_Print_Handler (void) @@ -20,8 +20,6 @@ ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, size_t start, size_t length) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event characters () ** start: %u end: %u ***************\n%s\n- End event characters () ---------------\n"), start, length, cdata)); @@ -30,8 +28,6 @@ ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, void ACEXML_Print_Handler::endDocument (void) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event endDocument () ***************\n"))); } @@ -41,8 +37,6 @@ ACEXML_Print_Handler::endElement (const ACEXML_Char *uri, const ACEXML_Char *name, const ACEXML_Char *qName) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event endElement (%s, %s, %s) ***************\n"), uri, name, qName)); @@ -51,8 +45,6 @@ ACEXML_Print_Handler::endElement (const ACEXML_Char *uri, void ACEXML_Print_Handler::endPrefixMapping (const ACEXML_Char *prefix) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event endPrefixMapping (%s) ***************\n"), prefix)); @@ -71,8 +63,6 @@ void ACEXML_Print_Handler::processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event processingInstruction (%s, %s) ***************\n"), target, data)); @@ -81,7 +71,6 @@ ACEXML_Print_Handler::processingInstruction (const ACEXML_Char *target, void ACEXML_Print_Handler::setDocumentLocator (ACEXML_Locator * locator) { - this->locator_ = locator; // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); } @@ -89,8 +78,6 @@ ACEXML_Print_Handler::setDocumentLocator (ACEXML_Locator * locator) void ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event skippedEntity (%s) ***************\n"), name)); @@ -99,8 +86,6 @@ ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name) void ACEXML_Print_Handler::startDocument (void) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event startDocument () ***************\n"))); } @@ -111,8 +96,6 @@ ACEXML_Print_Handler::startElement (const ACEXML_Char *uri, const ACEXML_Char *qName, ACEXML_Attributes *alist) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event startElement (%s, %s, %s) ***************\n"), uri, name, qName)); @@ -218,7 +201,6 @@ ACEXML_Print_Handler::fatalError (ACEXML_SAXParseException& ex) this->locator_->getLineNumber(), this->locator_->getColumnNumber())); ex.print(); - } void diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h index b383fb3cbef..da8381f50de 100644 --- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h +++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h @@ -142,10 +142,8 @@ public: */ virtual void warning (ACEXML_SAXParseException &exception); private: - ACEXML_Char* fileName_; ACEXML_Locator* locator_; - }; #endif /* ACEXML_PRINT_HANDLER_H */ -- cgit v1.2.1 From 037b0c63d3a2fb9eb6701122930583bba3ebd9c9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 15:17:54 +0200 Subject: removed commented out code * ACE/ACEXML/examples/SAXPrint/main.cpp: --- ACE/ACEXML/examples/SAXPrint/main.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/ACE/ACEXML/examples/SAXPrint/main.cpp b/ACE/ACEXML/examples/SAXPrint/main.cpp index 833705640b4..ea61c506050 100644 --- a/ACE/ACEXML/examples/SAXPrint/main.cpp +++ b/ACE/ACEXML/examples/SAXPrint/main.cpp @@ -173,30 +173,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); return 1; } -// ACEXML_TRY_EX (THIRD) -// { -// parser.parse (&input ACEXML_ENV_ARG_PARAMETER); -// ACEXML_TRY_CHECK_EX (THIRD); -// } -// ACEXML_CATCH (ACEXML_SAXException, ex) -// { -// ex.print(); -// ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); -// return 1; -// } -// ACEXML_ENDTRY; -// ACEXML_TRY_EX (FOURTH) -// { -// parser.parse (&input ACEXML_ENV_ARG_PARAMETER); -// ACEXML_TRY_CHECK_EX (FOURTH); -// } -// ACEXML_CATCH (ACEXML_SAXException, ex) -// { -// ex.print(); -// ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); -// return 1; -// } -// ACEXML_ENDTRY; return 0; } -- cgit v1.2.1 From 7e30d370d0c7104b2ab0ea61c1ff93b9f15797a3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 15:25:13 +0200 Subject: Fixed coverity error * ACE/ace/Naming_Context.cpp: --- ACE/ace/Naming_Context.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp index 8d0ba1d2335..ddfad7f9653 100644 --- a/ACE/ace/Naming_Context.cpp +++ b/ACE/ace/Naming_Context.cpp @@ -140,7 +140,8 @@ ACE_Naming_Context::close (void) ACE_Naming_Context::ACE_Naming_Context (void) : name_options_ (0), name_space_ (0), - netnameserver_host_ (0) + netnameserver_host_ (0), + netnameserver_port_ (0) { ACE_TRACE ("ACE_Naming_Context::ACE_Naming_Context"); -- cgit v1.2.1 From bbd816c5ddf6a8f44ccf6d5af520e134f578028b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 15:47:46 +0200 Subject: Fixed coverity errors, initialize pointers * TAO/tao/HTTP_Client.cpp: * TAO/tao/HTTP_Handler.cpp: --- TAO/tao/HTTP_Client.cpp | 1 + TAO/tao/HTTP_Handler.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp index 64f7f792068..f4ddaa6678d 100644 --- a/TAO/tao/HTTP_Client.cpp +++ b/TAO/tao/HTTP_Client.cpp @@ -10,6 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_HTTP_Client::TAO_HTTP_Client (void) + : filename_ (0) { } diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp index 8468a6d9ddf..c645b03007a 100644 --- a/TAO/tao/HTTP_Handler.cpp +++ b/TAO/tao/HTTP_Handler.cpp @@ -9,7 +9,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_HTTP_Handler::TAO_HTTP_Handler (void) +TAO_HTTP_Handler::TAO_HTTP_Handler (void) : + mb_ (0), + filename_ (0), + bytecount_ (0) { } -- cgit v1.2.1 From 4be7a6680d28a33c81773e464e1c58c9d719e458 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 15:48:07 +0200 Subject: Check the return value of get_component * TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp: --- TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp index 15c865ed9ef..5f15990b92d 100644 --- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp +++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp @@ -193,25 +193,31 @@ TAO_IORManip_IIOP_Filter::get_endpoints (TAO_Profile* profile, const TAO_Tagged_Components& comps = profile->tagged_components (); IOP::TaggedComponent tagged_component; tagged_component.tag = TAO_TAG_ENDPOINTS; - comps.get_component (tagged_component); - // Prepare the CDR for endpoint extraction - const CORBA::Octet *buf = - tagged_component.component_data.get_buffer (); + if (comps.get_component (tagged_component)) + { + // Prepare the CDR for endpoint extraction + const CORBA::Octet *buf = + tagged_component.component_data.get_buffer (); - TAO_InputCDR in_cdr (reinterpret_cast (buf), - tagged_component.component_data.length ()); + TAO_InputCDR in_cdr (reinterpret_cast (buf), + tagged_component.component_data.length ()); - // Extract the Byte Order. - CORBA::Boolean byte_order; - if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order))) - return 0; + // Extract the Byte Order. + CORBA::Boolean byte_order; + if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order))) + return 0; - in_cdr.reset_byte_order (static_cast (byte_order)); + in_cdr.reset_byte_order (static_cast (byte_order)); - // Extract endpoints sequence. - if (!(in_cdr >> endpoints)) - return 0; + // Extract endpoints sequence. + if (!(in_cdr >> endpoints)) + return 0; + } + else + { + return 0; + } return 1; } -- cgit v1.2.1 From 21737cc4d46d96e3b2c527b60277caf1bf4c3749 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Sep 2016 15:50:06 +0200 Subject: Initialise member * TAO/tao/Messaging/AMH_Response_Handler.cpp: --- TAO/tao/Messaging/AMH_Response_Handler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index f31f6d6c3a2..c251bcf0df5 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -20,6 +20,7 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () : reply_status_ (GIOP::NO_EXCEPTION) , mesg_base_ (0) , request_id_ (0) + , response_expected_ (0) , transport_ (0) , orb_core_ (0) , argument_flag_ (1) -- cgit v1.2.1 From 616babd5d1d50df61646b23bb6b4200f70dffe45 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Sep 2016 15:40:52 +0200 Subject: Added shutdown to cleanly shutdown the ORB and release all CORBA resources to resolve several valgrind reported memory leaks * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp: * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h: * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp: --- .../tests/InterfaceRepo/Persistence_Test/Ptest.cpp | 19 +++++++++++++++++++ .../tests/InterfaceRepo/Persistence_Test/Ptest.h | 3 +++ .../tests/InterfaceRepo/Persistence_Test/test.cpp | 10 ++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index c8f86a137ad..d18b5883ec6 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -59,6 +59,25 @@ Ptest::init (int argc, ACE_TCHAR *argv[]) return 0; } +int +Ptest::shutdown (void) +{ + try + { + this->repo_ = CORBA::Repository::_nil (); + + this->orb_->destroy (); + + this->orb_ = CORBA::ORB::_nil (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Ptest::init"); + return -1; + } + return 0; +} + int Ptest::run (void) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h index 6e675fc1f70..5f6c61df0fb 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h @@ -45,6 +45,9 @@ public: /// Execute test code. int run (void); + /// Cleanup + int shutdown (void); + private: /// The two IFR tests. void populate (void); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp index 7d5829a5a78..a3ee919438d 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -5,12 +5,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Ptest ptest; - int retval = ptest.init (argc, argv); + if (ptest.init (argc, argv) == -1) + return 1; - if (retval == -1) + if (ptest.run () == -1) return 1; - retval = ptest.run (); + if (ptest.shutdown () == -1) + return 1; - return retval; + return 0; } -- cgit v1.2.1 From cdf54724dea3807bfd5ed0773b11838048c2cf3a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Sep 2016 15:41:09 +0200 Subject: Zapped some empty lines * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README: --- TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README | 2 -- 1 file changed, 2 deletions(-) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README index a206fc29a42..aa02061d0ab 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README @@ -1,5 +1,3 @@ - - This test addresses the functionality of persistence in the Interface Repository. -- cgit v1.2.1 From 87671627d5de5ed9c4a5dd06c4e1f7710ecba9eb Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Sep 2016 16:00:08 +0200 Subject: Removed not needed variable * TAO/orbsvcs/IFR_Service/IFR_Service.h: --- TAO/orbsvcs/IFR_Service/IFR_Service.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 489a9e83f03..6e3d62ee102 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -49,13 +49,9 @@ public: void shutdown (void); protected: - /// Reference to our ORB. CORBA::ORB_var orb_; - /// Root POA reference. - PortableServer::POA_var root_poa_; - /// IFR Server instance. TAO_IFR_Server my_ifr_server_; }; -- cgit v1.2.1 From 5385cbc61f1ce880b06abd2960265297753f53cc Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Sep 2016 16:00:48 +0200 Subject: Cleanup * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h: * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp: * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: --- TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp | 3 +-- TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp | 2 -- TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 2ee9ffd3c7e..fe21ede6f1e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -23,8 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; TAO_IFR_Server::TAO_IFR_Server (void) - : //servant_locator_impl_ (0), - ior_multicast_ (0), + : ior_multicast_ (0), config_ (0) { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index 3b3b127c888..8fb9f31fc59 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -55,7 +55,7 @@ public: PortableServer::POA_ptr rp, int use_multicast_server = 0); - /// Destroy the child POA created in . + /// Destroy the child POA created in init_with_poa(). int fini (void); /// Destructor. diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index d18b5883ec6..d954dbd5a98 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" - - Ptest::Ptest (void) : debug_ (0), query_ (0) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl index cdafdc04f59..f37a7c4382a 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl @@ -72,7 +72,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -print "Starting Persistence_Test\n"; +print "Starting Persistence_Test 1\n"; $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); @@ -122,7 +122,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -print "Starting Persistence_Test\n"; +print "Starting Persistence_Test 2\n"; $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); -- cgit v1.2.1 From d4e368c76124dc6dea13e33f92411aef17197fca Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Sep 2016 16:20:00 +0200 Subject: Mark the IFRService persistence test with !FIXED_BUGS_ONLY, it fails frequently which goes back to 2009, see bugzilla 3699 * TAO/bin/tao_other_tests.lst: --- TAO/bin/tao_other_tests.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index f46fb7b24a6..95ceb43cca6 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -103,7 +103,7 @@ TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl: !MINIMUM !CORBA_E_COMPAC TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO !DISTRIBUTED TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO !FIXED_BUGS_ONLY TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !NO_IFR !ACE_FOR_TAO -- cgit v1.2.1 From 6cfd75bc1a5c717739f37a369ab82be4089c1a3d Mon Sep 17 00:00:00 2001 From: GaryN4 Date: Thu, 15 Sep 2016 15:43:46 +0100 Subject: Update Time_Value.inl --- ACE/ace/Time_Value.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index 98459b47713..f748f21b240 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -58,7 +58,7 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec) this->tv_.tv_sec = sec; this->tv_.tv_usec = usec; #if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4) - if ((__builtin_constant_p(sec) & + if ((__builtin_constant_p(sec) && __builtin_constant_p(usec)) && (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS)) return; -- cgit v1.2.1 From 7771149a115f4225b32990e97b5dc01766058ca4 Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Wed, 21 Sep 2016 09:59:59 -0500 Subject: Use explicit template class instantiation for ACE_*_SINGLETON_DECLARE with GCC 4 and above This prevents multiple definition of typeinfo symbols during linking, only seen on arm-linux-gnueabihf-g++. --- ACE/ace/config-g++-common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index e024997f42c..4ced0ef10b6 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -132,8 +132,9 @@ # endif # if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1 -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE ; +# define ACE_EXPORT_SINGLETON_DECLARATION(T) __extension__ extern template class ACE_Proper_Export_Flag T +# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class ACE_Proper_Export_Flag SINGLETON_TYPE ; +# define ACE_HAS_EXPLICIT_TEMPLATE_CLASS_INSTANTIATION # else /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */ # define ACE_EXPORT_SINGLETON_DECLARATION(T) \ _Pragma ("GCC visibility push(default)") \ -- cgit v1.2.1 From 5a15f3fc7dafee50bebd5436c2585021243b885e Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 21 Sep 2016 12:31:02 -0500 Subject: Use env var ACE_DEBUG to set ACE::debug_ from the environment. Looks like this was mistakenly updated to ACELIB_DEBUG when the logging statements were changed a few years ago. --- ACE/ace/ACE.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 73282bceae7..569d6bb9dab 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -164,7 +164,7 @@ ACE::nibble2hex (u_int n) bool ACE::debug (void) { - static const char* debug = ACE_OS::getenv ("ACELIB_DEBUG"); + static const char* debug = ACE_OS::getenv ("ACE_DEBUG"); return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false); } -- cgit v1.2.1 From e96e1a5f6dedc9931373e6619a6eddfd092cd144 Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Wed, 21 Sep 2016 13:13:34 -0500 Subject: Support MacOSX El Capitan without disabling the default System Integrity Protection mode. --- ACE/ace/config-macosx-leopard.h | 5 ++++- ACE/bin/MakeProjectCreator/templates/gnu.mpd | 3 +++ ACE/include/makeinclude/platform_macosx_elcapitan.GNU | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 1b9b90d1344..60fe9851162 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -4,6 +4,8 @@ #ifndef ACE_CONFIG_MACOSX_LEOPARD_H #define ACE_CONFIG_MACOSX_LEOPARD_H +#include + #define ACE_HAS_MAC_OSX #define ACE_HAS_NET_IF_DL_H @@ -205,10 +207,11 @@ #endif #define ACE_LACKS_CONDATTR_SETCLOCK +#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200 #define ACE_LACKS_CLOCKID_T #define ACE_LACKS_CLOCK_MONOTONIC #define ACE_LACKS_CLOCK_REALTIME - +#endif // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink // Fink installer puts libraries in /sw/lib and headers in /sw/include diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index bf5278c0d14..bed9ed41422 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -93,6 +93,9 @@ IDL_DEPS<%forcount%> = <%idl_file%> <%endif%> <%vpath%> + +LIBPATHS := <%libpaths%> + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/ACE/include/makeinclude/platform_macosx_elcapitan.GNU b/ACE/include/makeinclude/platform_macosx_elcapitan.GNU index 9d3c12028a2..d50bd5f5fe8 100644 --- a/ACE/include/makeinclude/platform_macosx_elcapitan.GNU +++ b/ACE/include/makeinclude/platform_macosx_elcapitan.GNU @@ -1,3 +1,13 @@ +ssl?=0 include $(ACE_ROOT)/include/makeinclude/platform_macosx_yosemite.GNU +## The following is to circumvent the restriction of System Integrity Protection (SIP) on Mac OS X El Capitan +## by embedding the path information of dynamic libraries into the executables. + +SOFLAGS += -install_name @rpath/$@ +space := $(subst ,, ) + +LDFLAGS += $(foreach libpath,$(LIBPATHS),-rpath $(if $(filter "/%,$(subst $(space),;,$(libpath))),$(libpath),@executable_path/$(libpath))) + + -- cgit v1.2.1 From 1e2f6fc64b2cc8fdf6824545a77cb93a8e890c8f Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Wed, 21 Sep 2016 13:25:48 -0500 Subject: Add ace/config-macosx-all.h and include/makeinclude/platform_macosx_all.GNU for auto-detecting macOS version --- ACE/ace/config-macosx-all.h | 23 +++++++++++++++ ACE/include/makeinclude/platform_macosx_all.GNU | 39 +++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 ACE/ace/config-macosx-all.h create mode 100644 ACE/include/makeinclude/platform_macosx_all.GNU diff --git a/ACE/ace/config-macosx-all.h b/ACE/ace/config-macosx-all.h new file mode 100644 index 00000000000..afd4819f518 --- /dev/null +++ b/ACE/ace/config-macosx-all.h @@ -0,0 +1,23 @@ +#ifndef ACE_CONFIG_MACOSX_ALL_H +#define ACE_CONFIG_MACOSX_ALL_H +#include + +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 100900 +#include "ace/config-macosx-mavericks.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 +#include "config-macosx-mountainlion.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100700 +#include "config-macosx-lion.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100600 +#include "config-macosx-snowleopard.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100500 +#include "config-macosx-leopard.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100400 +#include "config-macosx-tigher.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100300 +#include "config-macosx-pather.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100200 +#include "config-macosx.h" +#endif + +#endif // ACE_CONFIG_MACOSX_ALL_H diff --git a/ACE/include/makeinclude/platform_macosx_all.GNU b/ACE/include/makeinclude/platform_macosx_all.GNU new file mode 100644 index 00000000000..9f931101f02 --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_all.GNU @@ -0,0 +1,39 @@ +# include the platform_macosx_*.GNU based on the detected MacOS version + +MACOS_RELEASE_VERSION=$(shell sw_vers -productVersion) +MACOS_REL_WORDS := $(subst ., ,${MACOS_RELEASE_VERSION}) +MACOS_MAJOR_VERSION = $(word 1,${MACOS_REL_WORDS}) +MACOS_MINOR_VERSION = $(word 2,${MACOS_REL_WORDS}) +MACOS_BUILD_VERSION = $(word 3,${MACOS_REL_WORDS}) + + +MACOS_CODENAME_VER_10_2 := +MACOS_CODENAME_VER_10_3 := panther +MACOS_CODENAME_VER_10_4 := tigher +MACOS_CODENAME_VER_10_5 := leopard +MACOS_CODENAME_VER_10_6 := snowleopard +MACOS_CODENAME_VER_10_7 := lion +MACOS_CODENAME_VER_10_8 := mountainlion +MACOS_CODENAME_VER_10_9 := mavericks +MACOS_CODENAME_VER_10_10 := yosemite +MACOS_CODENAME_VER_10_11 := elcapitan +MACOS_CODENAME_VER_latest := elcapitan + +MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) + +ifeq ($(MACOS_MAJOR_VERSION),10) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 11; echo $$?),0) + ## if the detected version is greater than the lastest know version, + ## just use the lastest known version + MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) + else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0) + ## Unsupoorted minor version + $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) + endif +else + ## Unsupoorted major version + $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) +endif + +include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU + -- cgit v1.2.1 From e573d3d883eb53b4713e467dc611127a28ac4112 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 21 Sep 2016 14:28:10 -0500 Subject: Fuzz script needs special comments for this case --- ACE/ace/ACE.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 569d6bb9dab..d2812fe45d2 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -164,7 +164,9 @@ ACE::nibble2hex (u_int n) bool ACE::debug (void) { - static const char* debug = ACE_OS::getenv ("ACE_DEBUG"); + //FUZZ: disable check_for_ace_log_categories + static const char *debug = ACE_OS::getenv ("ACE_DEBUG"); + //FUZZ: enable check_for_ace_log_categories return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false); } -- cgit v1.2.1 From eb42ae1e7cbce5863f79e4519befccb13e8f9018 Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Wed, 21 Sep 2016 14:29:22 -0500 Subject: Fixed all explicit singleton template instantiation --- TAO/examples/RTCORBA/Activity/Activity.cpp | 5 ++--- TAO/examples/RTCORBA/Activity/Task_Stats.cpp | 4 +--- TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp | 4 +--- TAO/examples/RTScheduling/MIF_Scheduler/test.cpp | 4 +--- TAO/examples/RTScheduling/Task_Stats.cpp | 5 ++--- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 5 ++--- TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 4 +--- TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp | 4 +--- TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp | 4 +--- TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp | 4 +--- TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp | 4 +--- TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp | 4 +--- TAO/tests/Alt_Mapping/helper.cpp | 4 +--- TAO/tests/Alt_Mapping/options.cpp | 4 +--- TAO/tests/POA/DSI/Database_i.cpp | 4 +--- TAO/tests/Param_Test/helper.cpp | 4 +--- TAO/tests/Param_Test/options.cpp | 4 +--- 17 files changed, 20 insertions(+), 51 deletions(-) diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 67ebca5e150..89ff0aa17e5 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -401,6 +401,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return rc; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Activity, ACE_Null_Mutex); + diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index d76aba08b65..9998b2bf3b7 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -138,6 +138,4 @@ Task_Stats::dump_latency_stats ( tmin,tmax); } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Base_Time, TAO_SYNCH_MUTEX); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index df9a095bf50..92b8bcd4242 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -289,6 +289,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return status; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, DT_Test, TAO_SYNCH_MUTEX); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 33aae3ce537..612fc46bb0f 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -187,6 +187,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return status; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, DT_Test, TAO_SYNCH_MUTEX); diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 37a0f835ef0..053ffaf63a2 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -97,6 +97,5 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg) "Samples are ready to view\n")); } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Task_Stats, TAO_SYNCH_MUTEX); + diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 5c6b24a29bc..258748474d7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1146,8 +1146,7 @@ TAO_AV_Core::get_control_flowname(const char *flowname) return flowname; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex); + TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 20067f9e90e..e3f519b6152 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1320,9 +1320,7 @@ TAO_SFP_Frame_State::reset (void) return 0; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base, TAO_SYNCH_MUTEX); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 2971584dfe6..7b204e99b7c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -147,8 +147,6 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) info_ = info; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index c894c027050..43f90c1aedb 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -775,8 +775,6 @@ ACE_Scheduler_Factory::set_preemption_priority #endif /* HPUX && !g++ */ } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Scheduler_Factory_Data, ACE_Null_Mutex); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index f78102f88ef..492a6a2f2bf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -219,6 +219,4 @@ TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filte filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in()); } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /*ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index 78415f88ea5..6fb6b4f1306 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -340,6 +340,4 @@ TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples stats_.dump_samples (fname.c_str (), buf, dump_samples); } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Base_Time, TAO_SYNCH_MUTEX); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index 9d918022ac4..2a7be3a0ac0 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -220,6 +220,4 @@ MT_Priority::grain (void) } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Globals, ACE_Null_Mutex); diff --git a/TAO/tests/Alt_Mapping/helper.cpp b/TAO/tests/Alt_Mapping/helper.cpp index 8921f8f74cd..b1c28b87cc1 100644 --- a/TAO/tests/Alt_Mapping/helper.cpp +++ b/TAO/tests/Alt_Mapping/helper.cpp @@ -104,6 +104,4 @@ Generator::gen_fixed_struct (void) return this->fixed_struct_; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Generator, ACE_Recursive_Thread_Mutex); diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp index 99a828a576a..fc146142491 100644 --- a/TAO/tests/Alt_Mapping/options.cpp +++ b/TAO/tests/Alt_Mapping/options.cpp @@ -162,6 +162,4 @@ Options::shutdown (void) const return this->shutdown_; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Recursive_Thread_Mutex); diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp index 09554524fb5..7dae7d83b32 100644 --- a/TAO/tests/POA/DSI/Database_i.cpp +++ b/TAO/tests/POA/DSI/Database_i.cpp @@ -369,6 +369,4 @@ DatabaseImpl::Employee::operator delete (void *ptr, const ACE_nothrow_t&) throw #endif /* ACE_HAS_NEW_NOTHROW */ -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex); diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp index 576ab86f6f1..8e5b49caf59 100644 --- a/TAO/tests/Param_Test/helper.cpp +++ b/TAO/tests/Param_Test/helper.cpp @@ -113,6 +113,4 @@ Generator::gen_step (void) return this->step_; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Generator, ACE_Recursive_Thread_Mutex); diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index 6539b3a8dcf..52dc12bd4ba 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -229,6 +229,4 @@ Options::shutdown (void) const return this->shutdown_; } -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton *ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Recursive_Thread_Mutex); -- cgit v1.2.1 From 9979d94aaf9ced72f193f2197dd3fa2901958363 Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Wed, 21 Sep 2016 15:08:19 -0500 Subject: remove '-all' from the filenames of config-macosx-all.h and platform_macosx_all.GNU and rename the original *macosx.(h,GNU) files with juguar suffix --- ACE/ace/config-macosx-all.h | 23 --- ACE/ace/config-macosx-jaguar.h | 178 +++++++++++++++++++ ACE/ace/config-macosx.h | 197 +++------------------ ACE/include/makeinclude/platform_macosx.GNU | 69 ++++---- ACE/include/makeinclude/platform_macosx_all.GNU | 39 ---- ACE/include/makeinclude/platform_macosx_jaguar.GNU | 42 +++++ 6 files changed, 274 insertions(+), 274 deletions(-) delete mode 100644 ACE/ace/config-macosx-all.h create mode 100644 ACE/ace/config-macosx-jaguar.h delete mode 100644 ACE/include/makeinclude/platform_macosx_all.GNU create mode 100644 ACE/include/makeinclude/platform_macosx_jaguar.GNU diff --git a/ACE/ace/config-macosx-all.h b/ACE/ace/config-macosx-all.h deleted file mode 100644 index afd4819f518..00000000000 --- a/ACE/ace/config-macosx-all.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef ACE_CONFIG_MACOSX_ALL_H -#define ACE_CONFIG_MACOSX_ALL_H -#include - -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 100900 -#include "ace/config-macosx-mavericks.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 -#include "config-macosx-mountainlion.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100700 -#include "config-macosx-lion.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100600 -#include "config-macosx-snowleopard.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100500 -#include "config-macosx-leopard.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100400 -#include "config-macosx-tigher.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100300 -#include "config-macosx-pather.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100200 -#include "config-macosx.h" -#endif - -#endif // ACE_CONFIG_MACOSX_ALL_H diff --git a/ACE/ace/config-macosx-jaguar.h b/ACE/ace/config-macosx-jaguar.h new file mode 100644 index 00000000000..729c7ffe190 --- /dev/null +++ b/ACE/ace/config-macosx-jaguar.h @@ -0,0 +1,178 @@ +/* -*- C++ -*- */ +// This configuration file is designed to work with the MacOS X operating system, version 10.2 (Jaguar). + +#ifndef ACE_CONFIG_MACOSX_H +#define ACE_CONFIG_MACOSX_H + +#if ! defined (__ACE_INLINE__) +#define __ACE_INLINE__ +#endif /* ! __ACE_INLINE__ */ + +#if defined (__GNUG__) +# include "ace/config-g++-common.h" +#endif /* __GNUG__ */ + +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" + +#if defined (ACE_HAS_PENTIUM) +# undef ACE_HAS_PENTIUM +#endif /* ACE_HAS_PENTIUM */ + +#if !defined (_THREAD_SAFE) +#define _THREAD_SAFE +#endif /* _THREAD_SAFE */ + +#define ACE_HAS_GPERF +#define ACE_HAS_POSIX_SEM + +//#define ACE_HAS_SVR4_TLI + +#define ACE_LACKS_STROPTS_H +#define ACE_LACKS_WCHAR_H + +#define ACE_SYS_SELECT_NEEDS_UNISTD_H + +// +// Compiler/platform defines the sig_atomic_t typedef. +#define ACE_HAS_SIG_ATOMIC_T + +// Compiler/platform supports SVR4 signal typedef +#define ACE_HAS_SVR4_SIGNAL_T + +//Platform/compiler has the sigwait(2) prototype +#define ACE_HAS_SIGWAIT + +//Platform supports sigsuspend() +#define ACE_HAS_SIGSUSPEND + +//#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS +#define ACE_LACKS_GETPGID +#define ACE_LACKS_RWLOCK_T + +#define ACE_HAS_SIOCGIFCONF + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +#define ACE_HAS_NONCONST_SELECT_TIMEVAL + +#define ACE_HAS_SYSCTL + +#define ACE_NEEDS_SCHED_H + +#define ACE_LACKS_MALLOC_H + +#define ACE_HAS_ALT_CUSERID + +// Platform supports POSIX timers via struct timespec. +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_UALARM + +// Platform defines struct timespec but not timespec_t +#define ACE_LACKS_TIMESPEC_T + +#define ACE_LACKS_STRRECVFD + +#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN + +// Compiler/platform contains the file. +#define ACE_HAS_SYS_SYSCALL_H + +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES + +// Compiler/platform supports alloca(). +// Although ACE does have alloca() on this compiler/platform combination, it is +// disabled by default since it can be dangerous. Uncomment the following line +// if you ACE to use it. +//#define ACE_HAS_ALLOCA + +// Compiler/platform correctly calls init()/fini() for shared libraries. +#define ACE_HAS_AUTOMATIC_INIT_FINI + +// Explicit dynamic linking permits "lazy" symbol resolution +//#define ACE_HAS_RTLD_LAZY_V + +// platform supports POSIX O_NONBLOCK semantics +#define ACE_HAS_POSIX_NONBLOCK + +// platform supports IP multicast +#define ACE_HAS_IP_MULTICAST +#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 + +// Compiler/platform has the getrusage() system call. +#define ACE_HAS_GETRUSAGE + +// Compiler supports the ssize_t typedef. +#define ACE_HAS_SSIZE_T + +// Compiler/platform provides the sockio.h file. +#define ACE_HAS_SYS_SOCKIO_H + +// Defines the page size of the system. +#define ACE_HAS_GETPAGESIZE + +// Platform provides header. +#define ACE_HAS_SYS_FILIO_H + +// Platform/compiler supports timezone * as second parameter to gettimeofday(). +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY + +#define ACE_LACKS_SYS_MSG_H +#define ACE_LACKS_SYSV_MSQ_PROTOS +#define ACE_HAS_MSG +#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG +#define ACE_HAS_NONCONST_MSGSND + +#if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 1 +#endif + +#if ACE_MT_SAFE == 1 +// Yes, we do have threads. +# define ACE_HAS_THREADS +// And they're even POSIX pthreads +# define ACE_HAS_PTHREADS +# define ACE_HAS_THREAD_SPECIFIC_STORAGE +# define ACE_LACKS_THREAD_PROCESS_SCOPING +#endif /* ACE_MT_SAFE == 1 */ + +#define ACE_HAS_DIRENT +#define ACE_LACKS_POLL_H +#define ACE_LACKS_SEARCH_H + +#define ACE_LACKS_SETSCHED +//#define ACE_HAS_RECURSIVE_MUTEXES + +// Platform has POSIX terminal interface. +#define ACE_HAS_TERMIOS + +#define ACE_HAS_SEMUN +#define ACE_HAS_SIGINFO_T +#define ACE_LACKS_SIGINFO_H +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_GETIFADDRS +#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES +#define ACE_LACKS_UNNAMED_SEMAPHORE + +// dlcompat package (not part of base Darwin) is needed for dlopen(). +// You may download directly from sourceforge and install or use fink +// Fink installer puts libraries in /sw/lib and headers in /sw/include +// In order to install dlcompat do the following: +// - download fink from http://fink.sf.net +// - type: +// fink install dlcompat +// as of Dec 2002, if you use fink you will need to uncomment the next line +//#define ACE_NEEDS_DL_UNDERSCORE +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_LD_SEARCH_PATH ACE_TEXT ("DYLD_LIBRARY_PATH") +#define ACE_DLL_SUFFIX ACE_TEXT (".dylib") +#define ACE_LACKS_DLCLOSE + +// gperf seems to need this +#define ACE_HAS_NONSTATIC_OBJECT_MANAGER + +#if defined(__APPLE_CC__) && (__APPLE_CC__ < 1173) +#error "Compiler must be upgraded, see http://developer.apple.com" +#endif /* __APPLE_CC__ */ + +#endif /* ACE_CONFIG_MACOSX_H */ diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 729c7ffe190..afd4819f518 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -1,178 +1,23 @@ -/* -*- C++ -*- */ -// This configuration file is designed to work with the MacOS X operating system, version 10.2 (Jaguar). - -#ifndef ACE_CONFIG_MACOSX_H -#define ACE_CONFIG_MACOSX_H - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" - -#if defined (ACE_HAS_PENTIUM) -# undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ - -#define ACE_HAS_GPERF -#define ACE_HAS_POSIX_SEM - -//#define ACE_HAS_SVR4_TLI - -#define ACE_LACKS_STROPTS_H -#define ACE_LACKS_WCHAR_H - -#define ACE_SYS_SELECT_NEEDS_UNISTD_H - -// -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T - -//Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT - -//Platform supports sigsuspend() -#define ACE_HAS_SIGSUSPEND - -//#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_LACKS_GETPGID -#define ACE_LACKS_RWLOCK_T - -#define ACE_HAS_SIOCGIFCONF - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -#define ACE_HAS_SYSCTL - -#define ACE_NEEDS_SCHED_H - -#define ACE_LACKS_MALLOC_H - -#define ACE_HAS_ALT_CUSERID - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform supports alloca(). -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -//#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Defines the page size of the system. -#define ACE_HAS_GETPAGESIZE - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Platform/compiler supports timezone * as second parameter to gettimeofday(). -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -#define ACE_LACKS_SYS_MSG_H -#define ACE_LACKS_SYSV_MSQ_PROTOS -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_NONCONST_MSGSND - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 +#ifndef ACE_CONFIG_MACOSX_ALL_H +#define ACE_CONFIG_MACOSX_ALL_H +#include + +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 100900 +#include "ace/config-macosx-mavericks.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 +#include "config-macosx-mountainlion.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100700 +#include "config-macosx-lion.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100600 +#include "config-macosx-snowleopard.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100500 +#include "config-macosx-leopard.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100400 +#include "config-macosx-tigher.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100300 +#include "config-macosx-pather.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100200 +#include "config-macosx.h" #endif -#if ACE_MT_SAFE == 1 -// Yes, we do have threads. -# define ACE_HAS_THREADS -// And they're even POSIX pthreads -# define ACE_HAS_PTHREADS -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_LACKS_THREAD_PROCESS_SCOPING -#endif /* ACE_MT_SAFE == 1 */ - -#define ACE_HAS_DIRENT -#define ACE_LACKS_POLL_H -#define ACE_LACKS_SEARCH_H - -#define ACE_LACKS_SETSCHED -//#define ACE_HAS_RECURSIVE_MUTEXES - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -#define ACE_HAS_SEMUN -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_GETIFADDRS -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_UNNAMED_SEMAPHORE - -// dlcompat package (not part of base Darwin) is needed for dlopen(). -// You may download directly from sourceforge and install or use fink -// Fink installer puts libraries in /sw/lib and headers in /sw/include -// In order to install dlcompat do the following: -// - download fink from http://fink.sf.net -// - type: -// fink install dlcompat -// as of Dec 2002, if you use fink you will need to uncomment the next line -//#define ACE_NEEDS_DL_UNDERSCORE -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_LD_SEARCH_PATH ACE_TEXT ("DYLD_LIBRARY_PATH") -#define ACE_DLL_SUFFIX ACE_TEXT (".dylib") -#define ACE_LACKS_DLCLOSE - -// gperf seems to need this -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#if defined(__APPLE_CC__) && (__APPLE_CC__ < 1173) -#error "Compiler must be upgraded, see http://developer.apple.com" -#endif /* __APPLE_CC__ */ - -#endif /* ACE_CONFIG_MACOSX_H */ +#endif // ACE_CONFIG_MACOSX_ALL_H diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 303a317c1dd..9f931101f02 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -1,42 +1,39 @@ -# -*- Makefile -*- +# include the platform_macosx_*.GNU based on the detected MacOS version -# support for Mac OS X 10.2 (jaguar), 10.3 (panther) -# Note: /sw/lib & /sw/include are inserted for the convience of Fink -# users. Non-Fink users should simply create these directories to -# eliminate the warnings. +MACOS_RELEASE_VERSION=$(shell sw_vers -productVersion) +MACOS_REL_WORDS := $(subst ., ,${MACOS_RELEASE_VERSION}) +MACOS_MAJOR_VERSION = $(word 1,${MACOS_REL_WORDS}) +MACOS_MINOR_VERSION = $(word 2,${MACOS_REL_WORDS}) +MACOS_BUILD_VERSION = $(word 3,${MACOS_REL_WORDS}) -threads ?= 1 -debug ?= 1 -optimize ?= 0 -versioned_so ?= 0 -with_ld = macosx -CC = gcc -CXX = g++ -CFLAGS += -Wno-long-double -I/sw/include +MACOS_CODENAME_VER_10_2 := +MACOS_CODENAME_VER_10_3 := panther +MACOS_CODENAME_VER_10_4 := tigher +MACOS_CODENAME_VER_10_5 := leopard +MACOS_CODENAME_VER_10_6 := snowleopard +MACOS_CODENAME_VER_10_7 := lion +MACOS_CODENAME_VER_10_8 := mountainlion +MACOS_CODENAME_VER_10_9 := mavericks +MACOS_CODENAME_VER_10_10 := yosemite +MACOS_CODENAME_VER_10_11 := elcapitan +MACOS_CODENAME_VER_latest := elcapitan -DCFLAGS += -g -DLD = libtool -LD = $(CXX) -LDFLAGS += -L/sw/lib -flat_namespace -undefined warning -LIBS += -lcc_dynamic -lstdc++ -lSystem +MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) -## dlcompat package (not part of base Darwin) is needed for dlopen() on 10.2. -## Fink installer puts libraries in /sw/lib and headers in /sw/include -## In order to install dlcompat do the following: -## - download fink from http://fink.sf.net -## - type: -## fink install dlcompat -## 10.3 does not need this package. -LIBS += -ldl -# 10.3 cannot do -03, this could be version dependent (probably on gcc) -OCFLAGS += -O2 -RANLIB = ranlib -SOEXT = dylib -SOFLAGS += -dynamic -SOBUILD = -o $(VSHDIR)$*.dylib $< +ifeq ($(MACOS_MAJOR_VERSION),10) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 11; echo $$?),0) + ## if the detected version is greater than the lastest know version, + ## just use the lastest known version + MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) + else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0) + ## Unsupoorted minor version + $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) + endif +else + ## Unsupoorted major version + $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) +endif + +include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU diff --git a/ACE/include/makeinclude/platform_macosx_all.GNU b/ACE/include/makeinclude/platform_macosx_all.GNU deleted file mode 100644 index 9f931101f02..00000000000 --- a/ACE/include/makeinclude/platform_macosx_all.GNU +++ /dev/null @@ -1,39 +0,0 @@ -# include the platform_macosx_*.GNU based on the detected MacOS version - -MACOS_RELEASE_VERSION=$(shell sw_vers -productVersion) -MACOS_REL_WORDS := $(subst ., ,${MACOS_RELEASE_VERSION}) -MACOS_MAJOR_VERSION = $(word 1,${MACOS_REL_WORDS}) -MACOS_MINOR_VERSION = $(word 2,${MACOS_REL_WORDS}) -MACOS_BUILD_VERSION = $(word 3,${MACOS_REL_WORDS}) - - -MACOS_CODENAME_VER_10_2 := -MACOS_CODENAME_VER_10_3 := panther -MACOS_CODENAME_VER_10_4 := tigher -MACOS_CODENAME_VER_10_5 := leopard -MACOS_CODENAME_VER_10_6 := snowleopard -MACOS_CODENAME_VER_10_7 := lion -MACOS_CODENAME_VER_10_8 := mountainlion -MACOS_CODENAME_VER_10_9 := mavericks -MACOS_CODENAME_VER_10_10 := yosemite -MACOS_CODENAME_VER_10_11 := elcapitan -MACOS_CODENAME_VER_latest := elcapitan - -MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) - -ifeq ($(MACOS_MAJOR_VERSION),10) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 11; echo $$?),0) - ## if the detected version is greater than the lastest know version, - ## just use the lastest known version - MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) - else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0) - ## Unsupoorted minor version - $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) - endif -else - ## Unsupoorted major version - $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) -endif - -include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU - diff --git a/ACE/include/makeinclude/platform_macosx_jaguar.GNU b/ACE/include/makeinclude/platform_macosx_jaguar.GNU new file mode 100644 index 00000000000..303a317c1dd --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_jaguar.GNU @@ -0,0 +1,42 @@ +# -*- Makefile -*- + +# support for Mac OS X 10.2 (jaguar), 10.3 (panther) +# Note: /sw/lib & /sw/include are inserted for the convience of Fink +# users. Non-Fink users should simply create these directories to +# eliminate the warnings. + +threads ?= 1 +debug ?= 1 +optimize ?= 0 +versioned_so ?= 0 +with_ld = macosx + +CC = gcc +CXX = g++ +CFLAGS += -Wno-long-double -I/sw/include + +DCFLAGS += -g +DLD = libtool +LD = $(CXX) +LDFLAGS += -L/sw/lib -flat_namespace -undefined warning +LIBS += -lcc_dynamic -lstdc++ -lSystem + +## dlcompat package (not part of base Darwin) is needed for dlopen() on 10.2. +## Fink installer puts libraries in /sw/lib and headers in /sw/include +## In order to install dlcompat do the following: +## - download fink from http://fink.sf.net +## - type: +## fink install dlcompat +## 10.3 does not need this package. +LIBS += -ldl +# 10.3 cannot do -03, this could be version dependent (probably on gcc) +OCFLAGS += -O2 +RANLIB = ranlib +SOEXT = dylib +SOFLAGS += -dynamic +SOBUILD = -o $(VSHDIR)$*.dylib $< + +# Test for template instantiation, add to SOFLAGS if versioned_so set, +# add -E to LDFLAGS if using GNU ld +# +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU -- cgit v1.2.1 From 7a3126ae033cfab39c26ce38ad6112cf51e92f0d Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Thu, 22 Sep 2016 12:19:56 -0500 Subject: Fix issues with explicit template instantiation with versioned namespace --- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 8 ++++++-- TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 5 +++-- TAO/orbsvcs/orbsvcs/AV/sfp.h | 2 +- TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp | 7 ++++--- TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h | 8 ++++++-- TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp | 1 - 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 258748474d7..3290a0422df 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1146,7 +1146,11 @@ TAO_AV_Core::get_control_flowname(const char *flowname) return flowname; } -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex); - TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex); + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index e3f519b6152..3d105ee5ea7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -5,6 +5,7 @@ #include "ace/ARGV.h" #include "ace/OS_NS_strings.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL // default arguments to pass to use for the ORB @@ -840,7 +841,7 @@ TAO_SFP_Object::TAO_SFP_Object (TAO_AV_Callback *callback, max_credit_ (-1), current_credit_ (-1) { - TAO_SFP_BASE::instance (); + ACE_Singleton ::instance (); this->state_.static_frame_.size (2* this->transport_->mtu ()); } @@ -1320,7 +1321,7 @@ TAO_SFP_Frame_State::reset (void) return 0; } -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base, TAO_SYNCH_MUTEX); +//ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base, TAO_SYNCH_MUTEX); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index ec35e78373c..6b68ed3bb97 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -207,7 +207,7 @@ protected: }; // Beware the SFP_Base code relies on the Singleton being initialized. -typedef ACE_Singleton TAO_SFP_BASE; +// typedef ACE_Singleton TAO_SFP_BASE; /** * @class TAO_SFP_Object diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 7b204e99b7c..a2280c5c416 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -146,7 +146,8 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) } info_ = info; } - -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX); - TAO_END_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX) +ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index bc2678d7120..23cffbeebb4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -10,7 +10,7 @@ #ifndef GROUPINFOPUBLISHER_H #define GROUPINFOPUBLISHER_H - +#include "ftrtec_export.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Vector_T.h" @@ -73,8 +73,12 @@ private: Info_ptr info_; }; +TAO_END_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX) typedef ACE_Singleton GroupInfoPublisher; -TAO_END_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 43f90c1aedb..1190037fc93 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -775,6 +775,5 @@ ACE_Scheduler_Factory::set_preemption_priority #endif /* HPUX && !g++ */ } -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Scheduler_Factory_Data, ACE_Null_Mutex); TAO_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 9ef7b1dd9a1ac4181df901f81bd134b53884181b Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Thu, 22 Sep 2016 14:31:36 -0500 Subject: Fix some fuzz errors --- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 2 -- TAO/orbsvcs/orbsvcs/AV/sfp.h | 3 --- TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h | 4 ++-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 3290a0422df..ea7a4029ee1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1151,6 +1151,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex); +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 3d105ee5ea7..ad857ef4536 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1321,8 +1321,6 @@ TAO_SFP_Frame_State::reset (void) return 0; } -//ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base, TAO_SYNCH_MUTEX); - TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 6b68ed3bb97..a61fc453641 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -206,9 +206,6 @@ protected: // dumps the buffer to the screen. }; -// Beware the SFP_Base code relies on the Singleton being initialized. -// typedef ACE_Singleton TAO_SFP_BASE; - /** * @class TAO_SFP_Object * @brief diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index 23cffbeebb4..878e956a536 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -75,8 +75,8 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX) + +TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX) typedef ACE_Singleton GroupInfoPublisher; ACE_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From f1e42feed37f849562a1782f7f80a8ad371a3e46 Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Thu, 22 Sep 2016 16:38:33 -0500 Subject: Remove null reference checks --- TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp | 12 ------------ TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp | 9 --------- TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 8 -------- TAO/tao/AnyTypeCode/Any.cpp | 15 ++++++--------- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index e9fe0189bca..fb60b2eb2e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -221,12 +221,6 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << ")" << be_uidt_nl << "{" << be_idt_nl - << "if (0 == &_tao_elem) // Trying to de-reference NULL object" - << be_idt_nl - << "_tao_any <<= static_cast< ::" << node->name () - << " *>( 0 ); // Use non-copying insertion of a NULL" << be_uidt_nl - << "else" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" << be_idt << be_idt_nl << "_tao_any," << be_nl @@ -301,12 +295,6 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << be_uidt_nl << "{" << be_idt_nl - << "if (0 == &_tao_elem) // Trying to de-reference NULL object" - << be_idt_nl - << "_tao_any <<= static_cast<" << node->name () - << " *>( 0 ); // Use non-copying insertion of a NULL" << be_uidt_nl - << "else" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" << be_idt << be_idt_nl << "_tao_any," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index a898b868ff2..33402290f7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -113,11 +113,6 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << be_uidt_nl << "{" << be_idt_nl - << "if (0 == &_tao_elem) // Trying to de-reference NULL object" << be_idt_nl - << "_tao_any <<= static_cast< ::" << node->name () << " *>( 0 ); " - << "// Use non-copying insertion of a NULL" << be_uidt_nl - << "else" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" << be_idt << be_idt_nl << "_tao_any," << be_nl @@ -191,10 +186,6 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << be_uidt_nl << "{" << be_idt_nl - << "if (0 == &_tao_elem) // Trying to de-reference NULL object" << be_idt_nl - << "_tao_any <<= static_cast<" << node->name () << " *>( 0 ); // Use non-copying insertion of a NULL" << be_uidt_nl - << "else" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" << be_idt_nl << "_tao_any," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index 25ef8997291..73ff0b66ce8 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -109,10 +109,6 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << ")" << be_uidt_nl << "{" << be_idt_nl - << "if (0 == &_tao_elem) // Trying to de-reference NULL object" << be_idt_nl - << "_tao_any <<= static_cast< ::" << node->name () << " *>( 0 ); // Use non-copying insertion of a NULL" << be_uidt_nl - << "else" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" << be_idt << be_idt_nl << "_tao_any," << be_nl @@ -186,10 +182,6 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << ")" << be_uidt_nl << "{" << be_idt_nl - << "if (0 == &_tao_elem) // Trying to de-reference NULL object" << be_idt_nl - << "_tao_any <<= static_cast<" << node->name () << " *>( 0 ); // Use non-copying insertion of a NULL" << be_uidt_nl - << "else" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" << be_idt << be_idt_nl << "_tao_any," << be_nl diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 13619326827..b74124189a3 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -425,15 +425,12 @@ operator<<= (CORBA::Any &any, CORBA::LongDouble ld) void operator<<= (CORBA::Any &any, const CORBA::Any &a) { - if (0 == &a) // Trying to de-reference NULL Any - any <<= static_cast( 0 ); // Use non-copying insertion of a NULL - else - TAO::Any_Dual_Impl_T::insert_copy ( - any, - CORBA::Any::_tao_any_destructor, - CORBA::_tc_any, - a - ); + TAO::Any_Dual_Impl_T::insert_copy ( + any, + CORBA::Any::_tao_any_destructor, + CORBA::_tc_any, + a + ); } // Insertion of Any - non-copying. -- cgit v1.2.1 From 41f7f5747390ecc906b9677670321c37fd0879c1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 24 Sep 2016 08:14:01 +0200 Subject: Revert "ACE Core Typo Bug" --- ACE/ace/Time_Value.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index f748f21b240..98459b47713 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -58,7 +58,7 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec) this->tv_.tv_sec = sec; this->tv_.tv_usec = usec; #if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4) - if ((__builtin_constant_p(sec) && + if ((__builtin_constant_p(sec) & __builtin_constant_p(usec)) && (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS)) return; -- cgit v1.2.1 From 7f4cb857d93eaef328201ff95560f48eaa155c60 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 24 Sep 2016 09:03:56 +0200 Subject: Disable newer features because they lead to runtime problems on Android * ACE/ace/config-android.h: --- ACE/ace/config-android.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index 81318241e7f..6ef35e95fe2 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -400,6 +400,10 @@ # undef _B #endif +// Disable newer features, result in runtime failures on Android +#define ACE_LACKS_GETADDRINFO +#define ACE_LACKS_GETNAMEINFO + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_ANDROID_H */ -- cgit v1.2.1 From 65a6d0bb86e9df6fd323f646a512b9527ec73cb4 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Mon, 26 Sep 2016 14:03:12 -0500 Subject: Support for Android NDK r12b (Platform API 24) --- ACE/ace/config-android.h | 13 ++++++++----- ACE/ace/os_include/os_sched.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index 6ef35e95fe2..8b59463a53f 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -45,7 +45,12 @@ #define ACE_LACKS_SYS_MSG_H #define ACE_LACKS_SYS_SHM_H #define ACE_LACKS_SYS_SYSCTL_H -#define ACE_LACKS_UCONTEXT_H + +#if __ANDROID_API__ < 24 +# define ACE_LACKS_UCONTEXT_H +#else +# define ACE_HAS_UCONTEXT_T +#endif #define ACE_LACKS_CUSERID #define ACE_LACKS_FD_MASK @@ -126,6 +131,8 @@ # define ACE_HAS_ISASTREAM_PROTOTYPE # define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE # define ACE_HAS_CPU_SET_T +#elif __ANDROID_API__ >= 24 +# define ACE_HAS_CPU_SET_T #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */ // Then the compiler specific parts @@ -346,10 +353,6 @@ #elif __ANDROID_API__ == 8 # define ACE_LACKS_REGEX_H 1 # define ACE_LACKS_CONDATTR 1 -#elif __ANDROID_API__ == 9 -#elif __ANDROID_API__ == 14 -#else -# error Unsupported Android release #endif #if !defined ACE_DEFAULT_TEMP_DIR diff --git a/ACE/ace/os_include/os_sched.h b/ACE/ace/os_include/os_sched.h index c69b75315a3..7880bd3f190 100644 --- a/ACE/ace/os_include/os_sched.h +++ b/ACE/ace/os_include/os_sched.h @@ -37,7 +37,7 @@ extern "C" #if !defined (__cpu_set_t_defined) || !defined (ACE_HAS_CPU_SET_T) #if defined (ACE_HAS_CPUSET_T) typedef cpuset_t cpu_set_t; -#else +#elif !defined (ACE_HAS_CPU_SET_T) # define ACE_CPU_SETSIZE 1024 typedef struct { -- cgit v1.2.1 From fd0d79f44b951665480b34449d969fa20cdf43ac Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 27 Sep 2016 08:24:59 +0200 Subject: Set ACE_PLATFORM_CONFIG to config-android.h * ACE/include/makeinclude/platform_android.GNU: --- ACE/include/makeinclude/platform_android.GNU | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 756ba7e2d03..84d1a85a2b5 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -3,6 +3,9 @@ # This file should allow ACE to be built for Android 2.3.1 (API Level 9) # or greater, by cross compiling on Linux. +# We always include config-android.h on Android platforms. +ACE_PLATFORM_CONFIG ?= config-android.h + # The standalone gcc compilers in NDK r6-r9 have issues with the visibility. no_hidden_visibility ?= 1 -- cgit v1.2.1 From 668e749f2e66f540932c15078be44e14c5e43016 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 30 Sep 2016 12:38:23 -0500 Subject: Fixed parallel build error --- TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc index ce7b91b0499..6ce5d82e654 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc @@ -26,6 +26,10 @@ project(*Client) : ftnaming { Source_Files { client.cpp + TestC.cpp } + IDL_Files { + test_object.idl + } } -- cgit v1.2.1 From 0c03edc0a82959b51724d49e9ec2676609d5de9a Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 30 Sep 2016 14:55:21 -0500 Subject: NEWS updates --- ACE/NEWS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ACE/NEWS b/ACE/NEWS index 32675ff81a9..ee550e2de54 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,6 +1,20 @@ USER VISIBLE CHANGES BETWEEN ACE-6.4.0 and ACE-6.4.1 ==================================================== +. The ACE_DEBUG environment variable can again be used to set the + internal debug flag. This used to work but was mistakenly changed + in an earlier release. + +. Corrected usage of ACE_Singleton and template instantation to be + valid C++ (GCC cross-compiler arm-linux-gnueabihf-g++ requires it). + +. Added support for detecting the Mac OS X version when configured with + ace/config-macosx.h and include/makeinclude/platform_macosx.GNU. + Also on 10.11 El Capitan, use rpath to avoid a problem with SIP. + +. Added support for Android NDK r12b (Platform API 24) + + USER VISIBLE CHANGES BETWEEN ACE-6.3.4 and ACE-6.4.0 ==================================================== -- cgit v1.2.1 From 059594d621257c002e118c190a9a62fa2e04ced2 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 2 Oct 2016 20:53:08 +0200 Subject: Add OSX * .travis.yml: --- .travis.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a32bc2f3856..0efff690f65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ sudo: false language: cpp +os: + - linux + - os: osx + osx_image: xcode8 + compiler: - gcc env: @@ -31,7 +36,8 @@ branches: - master before_script: - export - - echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc - if [ "$ACETESTS" == "1" ]; then echo -e "\$(ACE_ROOT)/tests\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi - echo -e "}\n" >> $TRAVIS_BUILD_DIR/travis.mwc @@ -48,8 +54,9 @@ before_script: - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst - - if [ "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - if [ "$CXX" == "clang++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h -- cgit v1.2.1 From bd14f06fed22d7c77e0c54bddcd191a883cf72ad Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 2 Oct 2016 20:53:26 +0200 Subject: Fixed typo --- ACE/include/makeinclude/platform_macosx.GNU | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 9f931101f02..dd0c3b6f38b 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -7,7 +7,7 @@ MACOS_MINOR_VERSION = $(word 2,${MACOS_REL_WORDS}) MACOS_BUILD_VERSION = $(word 3,${MACOS_REL_WORDS}) -MACOS_CODENAME_VER_10_2 := +MACOS_CODENAME_VER_10_2 := MACOS_CODENAME_VER_10_3 := panther MACOS_CODENAME_VER_10_4 := tigher MACOS_CODENAME_VER_10_5 := leopard @@ -23,15 +23,15 @@ MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSI ifeq ($(MACOS_MAJOR_VERSION),10) ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 11; echo $$?),0) - ## if the detected version is greater than the lastest know version, - ## just use the lastest known version + ## if the detected version is greater than the latest know version, + ## just use the latest known version MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0) ## Unsupoorted minor version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) endif else - ## Unsupoorted major version + ## Unsupported major version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) endif -- cgit v1.2.1 From c85c5fd9e7055c9ec585e8a8f47035370354024d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 3 Oct 2016 08:33:54 +0200 Subject: Simplify travis-ci file * .travis.yml: --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0efff690f65..95baf1a4c4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,8 +55,7 @@ before_script: - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h -- cgit v1.2.1 From 1fb4e6a41f72f76bc319e8226d55ead210803be3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 3 Oct 2016 09:15:27 +0200 Subject: Attempt to fix osx * .travis.yml: --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95baf1a4c4a..43ae8f2eb79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ branches: before_script: - export - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc - if [ "$ACETESTS" == "1" ]; then echo -e "\$(ACE_ROOT)/tests\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi - echo -e "}\n" >> $TRAVIS_BUILD_DIR/travis.mwc @@ -54,7 +54,7 @@ before_script: - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features @@ -66,4 +66,3 @@ script: - perl $ACE_ROOT/bin/mwc.pl -type gnuace -workers 2 travis.mwc - make -j 2 - perl $ACE_ROOT/bin/auto_run_tests.pl -l $TAO_ROOT/bin/travis-ci.lst - -- cgit v1.2.1 From 7537e18615b02f5207927e81f460b6194e094e52 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 3 Oct 2016 09:49:30 +0200 Subject: Fixed osx OS * .travis.yml: --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 43ae8f2eb79..15942ed4576 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: cpp os: - linux - - os: osx + - osx osx_image: xcode8 compiler: -- cgit v1.2.1 From 3da46f1597c3860a4307934904e4342d0bbfc528 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 3 Oct 2016 10:26:27 +0200 Subject: Use no special osx * .travis.yml: --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 15942ed4576..a021b65a8ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: cpp os: - linux - osx - osx_image: xcode8 compiler: - gcc -- cgit v1.2.1 From 1c7fca09922cdc0964bf874504f80a575d6e9379 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 3 Oct 2016 12:04:55 +0200 Subject: Just linux for the moment * .travis.yml: --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a021b65a8ed..b11eb3e812e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: false language: cpp os: - linux - - osx compiler: - gcc -- cgit v1.2.1 From 1dacd1257ed117a8c04f283e3a662cda9bda539f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 3 Oct 2016 20:13:50 +0200 Subject: Added cast to silence win32 warnings * ACE/ace/Time_Value.cpp: --- ACE/ace/Time_Value.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 0cad794c554..e33d73ef35c 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -181,7 +181,7 @@ ACE_Time_Value::normalize (bool saturate) this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) { time_t sec = std::abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); - suseconds_t usec = this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS; + suseconds_t usec = static_cast (this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS); if (saturate && this->tv_.tv_sec > 0 && sec > 0 && ACE_Numeric_Limits::max() - this->tv_.tv_sec < sec) -- cgit v1.2.1 From 40cb5c604df5682bef240be456b52e135615770d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 4 Oct 2016 10:56:18 +0200 Subject: Make this script work again with newer perl versions * ACE/bin/diff-builds.pl: --- ACE/bin/diff-builds.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ACE/bin/diff-builds.pl b/ACE/bin/diff-builds.pl index 079fa54807a..64b88e6caff 100755 --- a/ACE/bin/diff-builds.pl +++ b/ACE/bin/diff-builds.pl @@ -199,7 +199,8 @@ sub find_builds ($$$$$) } if ($begin) { - %{$revision_hash}->{$columns[$selectcolumn_name]} = $columns[$selectcolumn_revision]; + my $temp = %{$revision_hash}; + $temp->{$columns[$selectcolumn_name]} = $columns[$selectcolumn_revision]; push (@{$rbuilds}, $columns[$selectcolumn_name]); } } -- cgit v1.2.1 From 999c2d14947c0e6f67061972cc8971789c5acbb4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 4 Oct 2016 12:07:48 +0200 Subject: Extended list of user visible changes * ACE/NEWS: * TAO/NEWS: --- ACE/NEWS | 3 ++- TAO/NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ACE/NEWS b/ACE/NEWS index ee550e2de54..75411ad3617 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -12,7 +12,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.4.0 and ACE-6.4.1 ace/config-macosx.h and include/makeinclude/platform_macosx.GNU. Also on 10.11 El Capitan, use rpath to avoid a problem with SIP. -. Added support for Android NDK r12b (Platform API 24) +. Added support for Android NDK r12b (Platform API 24) and improved + cross compilation support USER VISIBLE CHANGES BETWEEN ACE-6.3.4 and ACE-6.4.0 diff --git a/TAO/NEWS b/TAO/NEWS index 13cce97bd19..5d4c0d85667 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,6 +1,9 @@ USER VISIBLE CHANGES BETWEEN TAO-2.4.0 and TAO-2.4.1 ==================================================== +. Reduced amount of warnings given by newer gcc/clang + versions on the generated tao_idl code + USER VISIBLE CHANGES BETWEEN TAO-2.3.4 and TAO-2.4.0 ==================================================== -- cgit v1.2.1 From 8829191dda28a35e81d9fbe6b7c29abc9bb16524 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 5 Oct 2016 19:40:35 +0200 Subject: Remove ACE_STATIC_CONSTANT because there is no compiler anymore that lacks the support for static constants * ACE/ace/Global_Macros.h: * ACE/ace/Truncate.h: --- ACE/ace/Global_Macros.h | 12 +----------- ACE/ace/Truncate.h | 41 +++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 5d97d382da5..065709daa9c 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -867,7 +867,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC #endif /* ACE_WIN32 */ -// Some useful abstrations for expressions involving +// Some useful abstractions for expressions involving // ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* // with ACE_ALLOCATOR* is that they call constructors also. @@ -1034,16 +1034,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool # define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool -// Work around compilers that don't like in-class static integral -// constants. Constants in this case are meant to be compile-time -// constants so that they may be used as template arguments, for -// example. BOOST provides a similar macro. -#ifndef ACE_LACKS_STATIC_IN_CLASS_CONSTANTS -# define ACE_STATIC_CONSTANT(TYPE, ASSIGNMENT) static TYPE const ASSIGNMENT -#else -# define ACE_STATIC_CONSTANT(TYPE, ASSIGNMENT) enum { ASSIGNMENT } -#endif /* !ACE_LACKS_STATIC_IN_CLASS_CONSTANTS */ - #include /**/ "ace/post.h" #endif /*ACE_GLOBAL_MACROS_H*/ diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h index 528f4a3a6fa..fd9fed20f1f 100644 --- a/ACE/ace/Truncate.h +++ b/ACE/ace/Truncate.h @@ -32,28 +32,28 @@ namespace ACE_Utils template struct Sign_Check; // Specialize the unsigned signed cases. - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 0); }; - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 0); }; - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 0); }; - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 0); }; + template<> struct Sign_Check { static bool const is_signed = false; }; + template<> struct Sign_Check { static bool const is_signed = false; }; + template<> struct Sign_Check { static bool const is_signed = false; }; + template<> struct Sign_Check { static bool const is_signed = false; }; # ifdef __GNUC__ // Silence g++ "-pedantic" warnings regarding use of "long long" // type. __extension__ # endif /* __GNUC__ */ - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 0); }; + template<> struct Sign_Check { static bool const is_signed = false; }; // Specialize the signed cases. - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 1); }; - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 1); }; - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 1); }; - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 1); }; + template<> struct Sign_Check { static bool const is_signed = true; }; + template<> struct Sign_Check { static bool const is_signed = true; }; + template<> struct Sign_Check { static bool const is_signed = true; }; + template<> struct Sign_Check { static bool const is_signed = true; }; # ifdef __GNUC__ // Silence g++ "-pedantic" warnings regarding use of "long long" // type. __extension__ # endif /* __GNUC__ */ - template<> struct Sign_Check { ACE_STATIC_CONSTANT (bool, is_signed = 1); }; + template<> struct Sign_Check { static bool const is_signed = true; }; // ----------------------------------------------------- @@ -271,9 +271,8 @@ namespace ACE_Utils template struct Fast_Comparator { - ACE_STATIC_CONSTANT ( - bool, - USE_LEFT = ((sizeof (LEFT) > sizeof (RIGHT) + static bool const USE_LEFT = + ((sizeof (LEFT) > sizeof (RIGHT) && (Sign_Check::is_signed == 1 || Sign_Check::is_signed == 0)) @@ -289,15 +288,14 @@ namespace ACE_Utils && ((Sign_Check::is_signed == 1 && Sign_Check::is_signed == 1) || (Sign_Check::is_signed == 0 - && Sign_Check::is_signed == 0))))); + && Sign_Check::is_signed == 0)))); - ACE_STATIC_CONSTANT ( - bool, - USE_RIGHT = (sizeof (RIGHT) > sizeof (LEFT) + static bool const USE_RIGHT = + (sizeof (RIGHT) > sizeof (LEFT) && (Sign_Check::is_signed == 1 - || Sign_Check::is_signed == 0))); + || Sign_Check::is_signed == 0)); - ACE_STATIC_CONSTANT (bool, USABLE = (USE_LEFT || USE_RIGHT)); + static bool const USABLE = (USE_LEFT || USE_RIGHT); typedef typename ACE::If_Then_Else< USE_LEFT, @@ -370,12 +368,11 @@ namespace ACE_Utils template struct Truncator { - ACE_STATIC_CONSTANT ( - bool, + static bool const // max FROM always greater than max TO MAX_FROM_GT_MAX_TO = (sizeof(FROM) > sizeof (TO) || (sizeof(FROM) == sizeof (TO) - && Sign_Check::is_signed == 0))); + && Sign_Check::is_signed == 0)); typedef typename ACE::If_Then_Else< MAX_FROM_GT_MAX_TO, -- cgit v1.2.1 From a796d2a58d1fe560af15661f4d640d9eaae20c85 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 6 Oct 2016 09:43:53 +0200 Subject: Removed the bug fix only release concept, all micro releases the last years have been stable and there is no need anymore to have a special BFO release anymore * ACE/bin/make_release.py: * ACE/docs/ACE-development-process.html: * ACE/docs/Download.html: --- ACE/bin/make_release.py | 4 - ACE/docs/ACE-development-process.html | 16 ---- ACE/docs/Download.html | 142 ---------------------------------- 3 files changed, 162 deletions(-) diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 3962288d9a3..2ed7c760211 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -612,8 +612,6 @@ def tag (): elif opts.release_type == "beta": update_latest_tag ("Beta", tagname) update_latest_tag ("Micro", tagname) - if comp_versions["ACE_beta"] == 1: - update_latest_tag ("BFO", tagname) else: vprint ("Placing tag %s on ACE_TAO" % (tagname)) vprint ("Placing tag %s on MPC" % (tagname)) @@ -647,8 +645,6 @@ def push (): elif opts.release_type == "beta": push_latest_tag ("Beta", tagname) push_latest_tag ("Micro", tagname) - if comp_versions["ACE_beta"] == 1: - push_latest_tag ("BFO", tagname) else: vprint ("Pushing tag %s on ACE_TAO" % (tagname)) vprint ("Pushing tag %s on MPC" % (tagname)) diff --git a/ACE/docs/ACE-development-process.html b/ACE/docs/ACE-development-process.html index 4e25fcb84f2..7d980d3fd62 100644 --- a/ACE/docs/ACE-development-process.html +++ b/ACE/docs/ACE-development-process.html @@ -155,22 +155,6 @@ platforms. They are not, however, necessarily concerned with ensuring API compatibilities between micro releases, e.g., new features may be changed or removed between the micro releases.

-The first micro release following a major/minor release is called the -bug-fix-only (BFO) micro release. As the name implies, this -micro release only has fixes for the most recent major/minor releases. -Types of fixes and checkins that are allowed to go in for the BFO -include bug fixes in the implementation; fixes to the build systems -like Makefiles, project files, and MPC files; adding new tests and -examples; fixes to the documentation, etc. Fixes that are definitely -not allowed include changes to the public interface, refactoring -implementations, removing files from the repository, adding new files -into the repository, etc. The idea is to allow commercial support -vendors to stabilize the major or minor release for their product -offerings. As always, if you require 100% predictable stability and -support, please contact one of the companies that provides -commercial support for ACE+TAO.

-

Contributions from the Open-Source Community

diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index 8d450d6007f..4afb4abebd9 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -253,144 +253,6 @@ of the ACE and TAO micro release kit is available for -

- - -

  • Latest BFO Micro Release. The -Bug Fix Only micro release for the latest release of ACE 6.3, TAO 2.3, CIAO 1.3, and DAnCE 1.3 -is ACE 6.3.1, TAO 2.3.1, CIAO 1.3.1, and DAnCE 1.3.1 (ACE+TAO+CIAO+DAnCE x.3.1). Please use -the links below to download it. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FilenameDescriptionFullSources only
    ACE+TAO+CIAO.tar.gzACE+TAO+CIAO (tar+gzip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO+CIAO.tar.bz2ACE+TAO+CIAO (tar+bzip2 format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO+CIAO.zipACE+TAO+CIAO (zip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO+DAnCE.tar.gzACE+TAO+DAnCE (tar+gzip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO+DAnCE.tar.bz2ACE+TAO+DAnCE (tar+bzip2 format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO+DAnCE.zipACE+TAO+DAnCE (zip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO.tar.gzACE+TAO (tar+gzip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO.tar.bz2ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE+TAO.zipACE+TAO (zip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE-html.tar.gzDoxygen documentation for ACE+TAO+CIAO (tar+gzip format)[HTTP] - [FTP] -
    ACE-html.tar.bz2Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)[HTTP] - [FTP] -
    ACE-html.zipDoxygen documentation for ACE+TAO+CIAO (zip format)[HTTP] - [FTP] -
    ACE.tar.gzACE only (tar+gzip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE.tar.bz2ACE only (tar+bzip2 format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    ACE.zipACE only (zip format)[HTTP] - [FTP] - [HTTP] - [FTP] -
    -

    @@ -419,10 +281,6 @@ the links below to download it. http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/

  • Latest micro release with versioned namespaces http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/ -
  • Latest bug fix only release - http://download.opensuse.org/repositories/devel:/libraries:/ACE:/bugfixonly/ -
  • Latest bug fix only release with versioned namespaces - http://download.opensuse.org/repositories/devel:/libraries:/ACE:/bugfixonly:/versioned/
  • Latest minor release http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/
  • Latest minor release with versioned namespaces -- cgit v1.2.1 From 83db1ec85068af6520fbe44d324d9df34218b302 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 6 Oct 2016 12:41:00 +0200 Subject: Zapped some empty lines * ACE/apps/gperf/tests/test.cpp: --- ACE/apps/gperf/tests/test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/ACE/apps/gperf/tests/test.cpp b/ACE/apps/gperf/tests/test.cpp index 32f7240c200..6a936cfee68 100644 --- a/ACE/apps/gperf/tests/test.cpp +++ b/ACE/apps/gperf/tests/test.cpp @@ -6,8 +6,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" - - static const int MAX_LEN = 80; // Lookup function. -- cgit v1.2.1 From 03992c8595b278911f1ff37a97514b7285493400 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 10 Oct 2016 09:17:11 +0200 Subject: ACE+TAO-6_4_1 --- ACE/ChangeLogs/ACE-6_4_1 | 509 +++++++++++++++++++++ ACE/PROBLEM-REPORT-FORM | 2 +- ACE/VERSION | 2 +- ACE/ace/Version.h | 8 +- ACE/debian/ace.dsc | 6 +- ACE/debian/debian.control | 96 ++-- ACE/debian/libace-6.4.0.docs | 8 - ACE/debian/libace-6.4.0.install | 4 - ACE/debian/libace-6.4.0.lintian-overrides | 4 - ACE/debian/libace-6.4.1.docs | 8 + ACE/debian/libace-6.4.1.install | 4 + ACE/debian/libace-6.4.1.lintian-overrides | 4 + ACE/debian/libace-flreactor-6.4.0.install | 1 - .../libace-flreactor-6.4.0.lintian-overrides | 1 - ACE/debian/libace-flreactor-6.4.1.install | 1 + .../libace-flreactor-6.4.1.lintian-overrides | 1 + ACE/debian/libace-foxreactor-6.4.0.install | 1 - .../libace-foxreactor-6.4.0.lintian-overrides | 1 - ACE/debian/libace-foxreactor-6.4.1.install | 1 + .../libace-foxreactor-6.4.1.lintian-overrides | 1 + ACE/debian/libace-htbp-6.4.0.install | 1 - ACE/debian/libace-htbp-6.4.0.lintian-overrides | 1 - ACE/debian/libace-htbp-6.4.1.install | 1 + ACE/debian/libace-htbp-6.4.1.lintian-overrides | 1 + ACE/debian/libace-inet-6.4.0.install | 1 - ACE/debian/libace-inet-6.4.0.lintian-overrides | 2 - ACE/debian/libace-inet-6.4.1.install | 1 + ACE/debian/libace-inet-6.4.1.lintian-overrides | 2 + ACE/debian/libace-inet-ssl-6.4.0.install | 1 - ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides | 1 - ACE/debian/libace-inet-ssl-6.4.1.install | 1 + ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides | 1 + ACE/debian/libace-qtreactor-6.4.0.install | 1 - .../libace-qtreactor-6.4.0.lintian-overrides | 1 - ACE/debian/libace-qtreactor-6.4.1.install | 1 + .../libace-qtreactor-6.4.1.lintian-overrides | 1 + ACE/debian/libace-rmcast-6.4.0.install | 1 - ACE/debian/libace-rmcast-6.4.0.lintian-overrides | 1 - ACE/debian/libace-rmcast-6.4.1.install | 1 + ACE/debian/libace-rmcast-6.4.1.lintian-overrides | 1 + ACE/debian/libace-ssl-6.4.0.NEWS | 11 - ACE/debian/libace-ssl-6.4.0.install | 1 - ACE/debian/libace-ssl-6.4.0.lintian-overrides | 2 - ACE/debian/libace-ssl-6.4.1.NEWS | 11 + ACE/debian/libace-ssl-6.4.1.install | 1 + ACE/debian/libace-ssl-6.4.1.lintian-overrides | 2 + ACE/debian/libace-tkreactor-6.4.0.install | 1 - .../libace-tkreactor-6.4.0.lintian-overrides | 1 - ACE/debian/libace-tkreactor-6.4.1.install | 1 + .../libace-tkreactor-6.4.1.lintian-overrides | 1 + ACE/debian/libace-tmcast-6.4.0.install | 1 - ACE/debian/libace-tmcast-6.4.0.lintian-overrides | 1 - ACE/debian/libace-tmcast-6.4.1.install | 1 + ACE/debian/libace-tmcast-6.4.1.lintian-overrides | 1 + ACE/debian/libace-xml-utils-6.4.0.install | 1 - .../libace-xml-utils-6.4.0.lintian-overrides | 1 - ACE/debian/libace-xml-utils-6.4.1.install | 1 + .../libace-xml-utils-6.4.1.lintian-overrides | 1 + ACE/debian/libace-xtreactor-6.4.0.install | 1 - .../libace-xtreactor-6.4.0.lintian-overrides | 1 - ACE/debian/libace-xtreactor-6.4.1.install | 1 + .../libace-xtreactor-6.4.1.lintian-overrides | 1 + ACE/debian/libacexml-6.4.0.docs | 1 - ACE/debian/libacexml-6.4.0.install | 3 - ACE/debian/libacexml-6.4.0.lintian-overrides | 3 - ACE/debian/libacexml-6.4.1.docs | 1 + ACE/debian/libacexml-6.4.1.install | 3 + ACE/debian/libacexml-6.4.1.lintian-overrides | 3 + ACE/debian/libkokyu-6.4.0.docs | 1 - ACE/debian/libkokyu-6.4.0.install | 1 - ACE/debian/libkokyu-6.4.0.lintian-overrides | 1 - ACE/debian/libkokyu-6.4.1.docs | 1 + ACE/debian/libkokyu-6.4.1.install | 1 + ACE/debian/libkokyu-6.4.1.lintian-overrides | 1 + ACE/debian/libtao-2.4.0.docs | 4 - ACE/debian/libtao-2.4.0.install | 42 -- ACE/debian/libtao-2.4.0.lintian-overrides | 46 -- ACE/debian/libtao-2.4.1.docs | 4 + ACE/debian/libtao-2.4.1.install | 42 ++ ACE/debian/libtao-2.4.1.lintian-overrides | 46 ++ ACE/debian/libtao-flresource-2.4.0.install | 1 - .../libtao-flresource-2.4.0.lintian-overrides | 2 - ACE/debian/libtao-flresource-2.4.1.install | 1 + .../libtao-flresource-2.4.1.lintian-overrides | 2 + ACE/debian/libtao-foxresource-2.4.0.install | 1 - .../libtao-foxresource-2.4.0.lintian-overrides | 2 - ACE/debian/libtao-foxresource-2.4.1.install | 1 + .../libtao-foxresource-2.4.1.lintian-overrides | 2 + ACE/debian/libtao-orbsvcs-2.4.0.NEWS | 6 - ACE/debian/libtao-orbsvcs-2.4.0.install | 69 --- ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides | 71 --- ACE/debian/libtao-orbsvcs-2.4.1.NEWS | 6 + ACE/debian/libtao-orbsvcs-2.4.1.install | 69 +++ ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides | 71 +++ ACE/debian/libtao-qtresource-2.4.0.install | 1 - .../libtao-qtresource-2.4.0.lintian-overrides | 1 - ACE/debian/libtao-qtresource-2.4.1.install | 1 + .../libtao-qtresource-2.4.1.lintian-overrides | 1 + ACE/debian/libtao-tkresource-2.4.0.install | 1 - .../libtao-tkresource-2.4.0.lintian-overrides | 2 - ACE/debian/libtao-tkresource-2.4.1.install | 1 + .../libtao-tkresource-2.4.1.lintian-overrides | 2 + ACE/debian/libtao-xtresource-2.4.0.install | 1 - .../libtao-xtresource-2.4.0.lintian-overrides | 2 - ACE/debian/libtao-xtresource-2.4.1.install | 1 + .../libtao-xtresource-2.4.1.lintian-overrides | 2 + ACE/rpmbuild/ace-tao.spec | 4 +- TAO/ChangeLogs/TAO-2_4_1 | 251 ++++++++++ TAO/PROBLEM-REPORT-FORM | 4 +- TAO/VERSION | 2 +- TAO/tao/Version.h | 8 +- 111 files changed, 1141 insertions(+), 381 deletions(-) create mode 100644 ACE/ChangeLogs/ACE-6_4_1 delete mode 100644 ACE/debian/libace-6.4.0.docs delete mode 100644 ACE/debian/libace-6.4.0.install delete mode 100644 ACE/debian/libace-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-6.4.1.docs create mode 100644 ACE/debian/libace-6.4.1.install create mode 100644 ACE/debian/libace-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-flreactor-6.4.0.install delete mode 100644 ACE/debian/libace-flreactor-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-flreactor-6.4.1.install create mode 100644 ACE/debian/libace-flreactor-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-foxreactor-6.4.0.install delete mode 100644 ACE/debian/libace-foxreactor-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-foxreactor-6.4.1.install create mode 100644 ACE/debian/libace-foxreactor-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-htbp-6.4.0.install delete mode 100644 ACE/debian/libace-htbp-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-htbp-6.4.1.install create mode 100644 ACE/debian/libace-htbp-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-inet-6.4.0.install delete mode 100644 ACE/debian/libace-inet-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-inet-6.4.1.install create mode 100644 ACE/debian/libace-inet-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-inet-ssl-6.4.0.install delete mode 100644 ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-inet-ssl-6.4.1.install create mode 100644 ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-qtreactor-6.4.0.install delete mode 100644 ACE/debian/libace-qtreactor-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-qtreactor-6.4.1.install create mode 100644 ACE/debian/libace-qtreactor-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-rmcast-6.4.0.install delete mode 100644 ACE/debian/libace-rmcast-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-rmcast-6.4.1.install create mode 100644 ACE/debian/libace-rmcast-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-ssl-6.4.0.NEWS delete mode 100644 ACE/debian/libace-ssl-6.4.0.install delete mode 100644 ACE/debian/libace-ssl-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-ssl-6.4.1.NEWS create mode 100644 ACE/debian/libace-ssl-6.4.1.install create mode 100644 ACE/debian/libace-ssl-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-tkreactor-6.4.0.install delete mode 100644 ACE/debian/libace-tkreactor-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-tkreactor-6.4.1.install create mode 100644 ACE/debian/libace-tkreactor-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-tmcast-6.4.0.install delete mode 100644 ACE/debian/libace-tmcast-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-tmcast-6.4.1.install create mode 100644 ACE/debian/libace-tmcast-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-xml-utils-6.4.0.install delete mode 100644 ACE/debian/libace-xml-utils-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-xml-utils-6.4.1.install create mode 100644 ACE/debian/libace-xml-utils-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libace-xtreactor-6.4.0.install delete mode 100644 ACE/debian/libace-xtreactor-6.4.0.lintian-overrides create mode 100644 ACE/debian/libace-xtreactor-6.4.1.install create mode 100644 ACE/debian/libace-xtreactor-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libacexml-6.4.0.docs delete mode 100644 ACE/debian/libacexml-6.4.0.install delete mode 100644 ACE/debian/libacexml-6.4.0.lintian-overrides create mode 100644 ACE/debian/libacexml-6.4.1.docs create mode 100644 ACE/debian/libacexml-6.4.1.install create mode 100644 ACE/debian/libacexml-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libkokyu-6.4.0.docs delete mode 100644 ACE/debian/libkokyu-6.4.0.install delete mode 100644 ACE/debian/libkokyu-6.4.0.lintian-overrides create mode 100644 ACE/debian/libkokyu-6.4.1.docs create mode 100644 ACE/debian/libkokyu-6.4.1.install create mode 100644 ACE/debian/libkokyu-6.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-2.4.0.docs delete mode 100644 ACE/debian/libtao-2.4.0.install delete mode 100644 ACE/debian/libtao-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-2.4.1.docs create mode 100644 ACE/debian/libtao-2.4.1.install create mode 100644 ACE/debian/libtao-2.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-flresource-2.4.0.install delete mode 100644 ACE/debian/libtao-flresource-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-flresource-2.4.1.install create mode 100644 ACE/debian/libtao-flresource-2.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-foxresource-2.4.0.install delete mode 100644 ACE/debian/libtao-foxresource-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-foxresource-2.4.1.install create mode 100644 ACE/debian/libtao-foxresource-2.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-orbsvcs-2.4.0.NEWS delete mode 100644 ACE/debian/libtao-orbsvcs-2.4.0.install delete mode 100644 ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-orbsvcs-2.4.1.NEWS create mode 100644 ACE/debian/libtao-orbsvcs-2.4.1.install create mode 100644 ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-qtresource-2.4.0.install delete mode 100644 ACE/debian/libtao-qtresource-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-qtresource-2.4.1.install create mode 100644 ACE/debian/libtao-qtresource-2.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-tkresource-2.4.0.install delete mode 100644 ACE/debian/libtao-tkresource-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-tkresource-2.4.1.install create mode 100644 ACE/debian/libtao-tkresource-2.4.1.lintian-overrides delete mode 100644 ACE/debian/libtao-xtresource-2.4.0.install delete mode 100644 ACE/debian/libtao-xtresource-2.4.0.lintian-overrides create mode 100644 ACE/debian/libtao-xtresource-2.4.1.install create mode 100644 ACE/debian/libtao-xtresource-2.4.1.lintian-overrides create mode 100644 TAO/ChangeLogs/TAO-2_4_1 diff --git a/ACE/ChangeLogs/ACE-6_4_1 b/ACE/ChangeLogs/ACE-6_4_1 new file mode 100644 index 00000000000..4291f232c1d --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_4_1 @@ -0,0 +1,509 @@ +commit 83db1ec85068af6520fbe44d324d9df34218b302 +Author: Johnny Willemsen +Date: Thu Oct 6 12:41:00 2016 +0200 + + Zapped some empty lines + * ACE/apps/gperf/tests/test.cpp: + +commit a796d2a58d1fe560af15661f4d640d9eaae20c85 +Author: Johnny Willemsen +Date: Thu Oct 6 09:43:53 2016 +0200 + + Removed the bug fix only release concept, all micro releases the last years have been stable and there is no need anymore to have a special BFO release anymore + * ACE/bin/make_release.py: + * ACE/docs/ACE-development-process.html: + * ACE/docs/Download.html: + +commit 8829191dda28a35e81d9fbe6b7c29abc9bb16524 +Author: Johnny Willemsen +Date: Wed Oct 5 19:40:35 2016 +0200 + + Remove ACE_STATIC_CONSTANT because there is no compiler anymore that lacks the support for static constants + * ACE/ace/Global_Macros.h: + * ACE/ace/Truncate.h: + +commit 999c2d14947c0e6f67061972cc8971789c5acbb4 +Author: Johnny Willemsen +Date: Tue Oct 4 12:07:48 2016 +0200 + + Extended list of user visible changes + * ACE/NEWS: + * TAO/NEWS: + +commit 40cb5c604df5682bef240be456b52e135615770d +Author: Johnny Willemsen +Date: Tue Oct 4 10:56:18 2016 +0200 + + Make this script work again with newer perl versions + * ACE/bin/diff-builds.pl: + +commit 4e484bfb6c0ee71bde2313e333368a6b43fe937d +Merge: 1dacd12 4b67e5a +Author: Johnny Willemsen +Date: Mon Oct 3 20:13:57 2016 +0200 + + gerge branch 'master' of git://github.com/DOCGroup/ATCD + +commit 1dacd1257ed117a8c04f283e3a662cda9bda539f +Author: Johnny Willemsen +Date: Mon Oct 3 20:13:50 2016 +0200 + + Added cast to silence win32 warnings + * ACE/ace/Time_Value.cpp: + +commit 4b67e5a178658c04d86232b1bd649ecd3caf66b4 +Merge: b1d7ab6 1c7fca0 +Author: Johnny Willemsen +Date: Mon Oct 3 14:16:35 2016 +0200 + + Merge pull request #306 from jwillemsen/master + + Cleanup travis-ci support, some experiments for OSX but not completed + +commit bd14f06fed22d7c77e0c54bddcd191a883cf72ad +Author: Johnny Willemsen +Date: Sun Oct 2 20:53:26 2016 +0200 + + Fixed typo + +commit 0c03edc0a82959b51724d49e9ec2676609d5de9a +Author: Adam Mitz +Date: Fri Sep 30 14:55:21 2016 -0500 + + NEWS updates + +commit fd0d79f44b951665480b34449d969fa20cdf43ac +Author: Johnny Willemsen +Date: Tue Sep 27 08:24:59 2016 +0200 + + Set ACE_PLATFORM_CONFIG to config-android.h + * ACE/include/makeinclude/platform_android.GNU: + +commit 65a6d0bb86e9df6fd323f646a512b9527ec73cb4 +Author: Adam Mitz +Date: Mon Sep 26 14:03:12 2016 -0500 + + Support for Android NDK r12b (Platform API 24) + +commit ff14fd0b2562642866130b3e1b6ccbbd318365f0 +Merge: ad376e1 41f7f57 +Author: Johnny Willemsen +Date: Sat Sep 24 09:18:25 2016 +0200 + + Merge pull request #301 from DOCGroup/revert-300-master + + Revert "ACE Core Typo Bug" + +commit 7f4cb857d93eaef328201ff95560f48eaa155c60 +Author: Johnny Willemsen +Date: Sat Sep 24 09:03:56 2016 +0200 + + Disable newer features because they lead to runtime problems on Android + * ACE/ace/config-android.h: + +commit 41f7f5747390ecc906b9677670321c37fd0879c1 +Author: Johnny Willemsen +Date: Sat Sep 24 08:14:01 2016 +0200 + + Revert "ACE Core Typo Bug" + +commit ce6a48bf72de2c6f5aa2bfc099f1e87d4246b5dd +Merge: d788b54 ddc8667 +Author: Johnny Willemsen +Date: Fri Sep 23 13:56:22 2016 +0200 + + Merge pull request #300 from GaryN4/master + + ACE Core Typo Bug + +commit 784a25d9950a1c5587a1ca51c41ca6f84b9e3e60 +Merge: 688a39c 9979d94 +Author: Adam Mitz +Date: Thu Sep 22 16:10:14 2016 -0500 + + Merge pull request #298 from huangminghuang/macosx_elcapitan + + Better Mac OSX support + +commit 688a39c1edaa36714a33c088cb3d6b0273796534 +Merge: 92223ac e573d3d +Author: Adam Mitz +Date: Thu Sep 22 16:10:09 2016 -0500 + + Merge pull request #297 from mitza-oci/master + + Use env var ACE_DEBUG to set ACE::debug_ from the environment. + +commit 9979d94aaf9ced72f193f2197dd3fa2901958363 +Author: Huang-Ming Huang +Date: Wed Sep 21 15:08:19 2016 -0500 + + remove '-all' from the filenames of config-macosx-all.h and platform_macosx_all.GNU and rename the original *macosx.(h,GNU) files with juguar suffix + +commit e573d3d883eb53b4713e467dc611127a28ac4112 +Author: Adam Mitz +Date: Wed Sep 21 14:28:10 2016 -0500 + + Fuzz script needs special comments for this case + +commit 1e2f6fc64b2cc8fdf6824545a77cb93a8e890c8f +Author: Huang-Ming Huang +Date: Wed Sep 21 13:25:48 2016 -0500 + + Add ace/config-macosx-all.h and include/makeinclude/platform_macosx_all.GNU for auto-detecting macOS version + +commit e96e1a5f6dedc9931373e6619a6eddfd092cd144 +Author: Huang-Ming Huang +Date: Wed Sep 21 13:13:34 2016 -0500 + + Support MacOSX El Capitan without disabling the default System Integrity Protection mode. + +commit 5a15f3fc7dafee50bebd5436c2585021243b885e +Author: Adam Mitz +Date: Wed Sep 21 12:31:02 2016 -0500 + + Use env var ACE_DEBUG to set ACE::debug_ from the environment. + + Looks like this was mistakenly updated to ACELIB_DEBUG when the logging statements were changed a few years ago. + +commit 7771149a115f4225b32990e97b5dc01766058ca4 +Author: Huang-Ming Huang +Date: Wed Sep 21 09:59:59 2016 -0500 + + Use explicit template class instantiation for ACE_*_SINGLETON_DECLARE with GCC 4 and above + + This prevents multiple definition of typeinfo symbols during linking, + only seen on arm-linux-gnueabihf-g++. + +commit 6cfd75bc1a5c717739f37a369ab82be4089c1a3d +Author: GaryN4 +Date: Thu Sep 15 15:43:46 2016 +0100 + + Update Time_Value.inl + +commit 7e30d370d0c7104b2ab0ea61c1ff93b9f15797a3 +Author: Johnny Willemsen +Date: Wed Sep 14 15:25:13 2016 +0200 + + Fixed coverity error + * ACE/ace/Naming_Context.cpp: + +commit 037b0c63d3a2fb9eb6701122930583bba3ebd9c9 +Author: Johnny Willemsen +Date: Wed Sep 14 15:17:54 2016 +0200 + + removed commented out code + * ACE/ACEXML/examples/SAXPrint/main.cpp: + +commit 06b6bea83df9722ada3a0972db825de7750eaf33 +Author: Johnny Willemsen +Date: Wed Sep 14 15:17:01 2016 +0200 + + Fixed coverity reported issues + * ACE/ACEXML/common/Mem_Map_Stream.cpp: + * ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp: + * ACE/ACEXML/examples/SAXPrint/Print_Handler.h: + +commit 4ebc48ab2088bb536b3810db372b830415bbe74c +Author: Johnny Willemsen +Date: Wed Sep 14 11:36:02 2016 +0200 + + Don't delete the member of the base in ACEXML_SAXNotSupportedException, the base class destructor already handles that + * ACE/ACEXML/common/SAXExceptions.cpp: + +commit 851196b5e70421cd62c16e47ccd3863591ffa8c7 +Author: Johnny Willemsen +Date: Wed Sep 14 11:13:08 2016 +0200 + + Fixed reported memory leak by Coverity + * ACE/tests/Compiler_Features_21_Test.cpp: + +commit a49ca87a1393375a3c00363d94ec1ba0243ee8a1 +Merge: 37ce198 8e8a781 +Author: Johnny Willemsen +Date: Mon Sep 12 08:51:00 2016 +0200 + + Merge pull request #279 from dlifshitz-maca/BZ-4216_01 + + BZ-4216 Android build fails when not cross-compiled on Linux + +commit 8e8a781442a5ae5e4938a469ac5e8df91f3707bd +Author: David Lifshitz +Date: Tue Aug 2 16:30:12 2016 -0400 + + BZ-4216 Android build fails when not cross-compiled on Linux + + [Changed] + platform_android.GNU + - removed extra comment and include + +commit 37ce198752139f0886592ff78879d0051736bb9a +Merge: 4b78b50 e240612 +Author: Johnny Willemsen +Date: Sun Sep 11 12:45:10 2016 +0200 + + Merge pull request #292 from jwillemsen/master + + Use std::abs instead of abs + +commit 4b78b50b8a0ebeb75a285d0f5c7240bb6bad7ca6 +Merge: 5a33d55 f4bfd1c +Author: Johnny Willemsen +Date: Sun Sep 11 11:18:32 2016 +0200 + + Merge pull request #291 from ops/master + + Take 2: Handle system functions that may be defined as macros on some… + +commit e24061216228b5ead1ea90e3e9d0d4df8df8b8f4 +Author: Johnny Willemsen +Date: Sun Sep 11 11:02:43 2016 +0200 + + Use std::abs instead of abs + * ACE/ace/Time_Value.cpp: + +commit f4bfd1ca023c8ea58aa3ca4147ff883b12ecde37 +Author: Olli Savia +Date: Fri Sep 9 18:07:48 2016 +0300 + + Moved ACE_LACKS_xxxTIME_R defines to config-win32-msvc.h + +commit c982c07989a3286e0f91705f0583b1ffad2dcda0 +Author: Olli Savia +Date: Fri Sep 9 17:47:40 2016 +0300 + + Take 2: Handle system functions that may be defined as macros on some platforms + +commit 5a33d55ef56723226a3d4ac779ecd4fe96530c38 +Merge: d19738b 58100d3 +Author: Johnny Willemsen +Date: Fri Sep 9 09:03:12 2016 +0200 + + Merge pull request #200 from INMarkus/Bug#4084-Patch + + Fix for Bug 4084 - ACE_Time_Value::set(double) hangs on large numbers + +commit bc841d6bb68196f65d0286bd118af7fe3b67efdc +Author: Johnny Willemsen +Date: Thu Sep 8 12:13:24 2016 +0200 + + Use stati65 with MinGW + * ACE/ace/OS_NS_sys_stat.h: + +commit 03ef5706e8b3dcdd8de7636f39aaca7543b23283 +Author: Johnny Willemsen +Date: Fri Sep 2 20:53:02 2016 +0200 + + Revert "*_SINGLETON_DECLARE needs to appear in .cpp files, not .h." + + This reverts commit 411929ec7d2550f289eb1a2f045f2fc6651cb002. + +commit 411929ec7d2550f289eb1a2f045f2fc6651cb002 +Author: Adam Mitz +Date: Wed Aug 24 15:40:44 2016 -0500 + + *_SINGLETON_DECLARE needs to appear in .cpp files, not .h. + + This prevents multiple definition of typeinfo symbols during linking, + only seen on arm-linux-gnueabihf-g++ but the code is invalid C++ on + all platforms. + +commit c6a04b11d5e960451861a5d51d469dc48376a05f +Author: Adam Mitz +Date: Wed Aug 24 15:39:55 2016 -0500 + + fixed makefile syntax error + +commit 72c5994d4fae5813925762afd1f1cc102ae88944 +Merge: b3b4e68 1b4dabc +Author: Adam Mitz +Date: Wed Aug 10 10:27:05 2016 -0500 + + Merge pull request #282 from oschwaldp-oci/topic_footprint_fixes + + Footprint script fixes + +commit 33c4e1e642d55814fd7bcd044a6ac7871208dbc2 +Author: Johnny Willemsen +Date: Wed Aug 10 13:52:48 2016 +0200 + + Layout change + * ACE/ace/POSIX_Proactor.cpp: + +commit 68e2cf228e4f053358361993c4dccfde507ab9f7 +Author: Johnny Willemsen +Date: Wed Aug 10 13:52:41 2016 +0200 + + removed SGI from comment, not used anymore + * ACE/ace/OS_NS_sys_mman.inl: + +commit ca6d7f0a90498b003eaa541394c3cb4d54d0f148 +Author: Johnny Willemsen +Date: Wed Aug 10 13:49:57 2016 +0200 + + Removed old left over of SGI + * ACE/ace/POSIX_Proactor.cpp: + +commit 571605a737200863989ba3d438e15619da419b1d +Merge: 18cb084 a87c34e +Author: Johnny Willemsen +Date: Wed Aug 10 13:47:53 2016 +0200 + + Merge branch 'master' of git://github.com/DOCGroup/ATCD + +commit ad958e7639275dc8626599ac0bfcc805a7e4ea76 +Author: Johnny Willemsen +Date: Wed Aug 10 13:28:52 2016 +0200 + + Fixed typos + * ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: + * ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: + * ACE/examples/QOS/Simple/QoS_Util.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h: + * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h: + +commit 1b4dabcbd23e2892df7766bb719a64e001bdd9a5 +Author: Peter Oschwald +Date: Tue Aug 9 16:48:47 2016 -0500 + + Remove sed search and replace as it malfunctions with files or directories ending or beginning with a 0, which in some cases like tests, causes the output links to break in the created report pages. + +commit b17449e2d53c67fb7343e594d65dcbd915d1d0b0 +Author: Peter Oschwald +Date: Tue Aug 9 11:41:05 2016 -0500 + + Fix use case for non-ACE/TAO/CIAO/DAnCE footprint calculations. Need to actually populate an array to pass to sort_list. + +commit 72485ec324e2c11a24ec679e8269c38122e323fc +Author: David Lifshitz +Date: Tue Aug 2 16:36:20 2016 -0400 + + BZ-4217 Android 6 with 3rd party AIO not working + + [Changed] + POSIX_Proactor.cpp + - disable an OS bounds check for Android since it does not support AIO + and ACE_HAS_AIO_CALLS will only be defined if a 3rd party lib is used + + [Tests] + Test 1: + 1) Compile ACE for Android using a 3rd party AIO lib + 2) In the implementation of ACE_Service_Handler::open, try to read from + an ACE_Asynch_Read_Stream + 3) Verify it returns >= 0 with no error + +commit a84855c64690c8048fe1a8513c0a8b54af345b4b +Author: David Lifshitz +Date: Tue Aug 2 16:30:12 2016 -0400 + + BZ-4216 Android build fails when not cross-compiled on Linux + + [Changed] + platform_android.GNU + - replace the platform_linux_common.GNU include with its contents + except the erroneous call to getconf + + [Tests] + Test 1: + 1) Compile ACE for Android using OSX or Windows + 2) Verify build is successful + +commit c752cc58a68f2f91da9550764a55b6dc7f91432c +Author: Steve Huston +Date: Thu Jul 7 20:15:29 2016 -0400 + + Case 2025, see notes + (cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0) + +commit 7627b5e0073d58550491af5493237880f514b66a +Author: Steve Huston +Date: Thu Jul 14 15:13:27 2016 -0400 + + Revert "Case 2025, see notes"; should have made this a pull request. + + This reverts commit dcdedb05f23e55c2c9b718e666554ed6e75d99a5. + +commit dcdedb05f23e55c2c9b718e666554ed6e75d99a5 +Author: Steve Huston +Date: Thu Jul 7 20:15:29 2016 -0400 + + Case 2025, see notes + (cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0) + +commit 64e20f76a068d75086794de63f31388c249ccad7 +Author: Johnny Willemsen +Date: Wed Jul 6 20:18:13 2016 +0200 + + Removed empty comment lines + * ACE/tests/Compiler_Features_20_DLL.cpp: + * ACE/tests/Compiler_Features_22_DLL.cpp: + +commit b1b43173cff6eb21a5f7e9ce8ab18f62b2304225 +Author: Johnny Willemsen +Date: Wed Jul 6 09:30:47 2016 +0200 + + Updated lin + * ACE/ace/config-macosx-sierra.h: + +commit 0f7b8dcc81a8c1d7ebd1fb70573f1657dbb8ee80 +Author: Johnny Willemsen +Date: Wed Jul 6 09:29:40 2016 +0200 + + Fixed some version numbers + * ACE/debian/debian.control: + +commit a2b3e76ab4407981816cfa903b9fc749b8c53886 +Author: Johnny Willemsen +Date: Wed Jul 6 09:29:31 2016 +0200 + + New files for MacOSX 10.12 (Sierra) + * ACE/ace/config-macosx-sierra.h: + * ACE/include/makeinclude/platform_macosx_sierra.GNU: + Added. + +commit 7c7157b6132b68a04f064a1bdb949b9f9acc7188 +Author: Johnny Willemsen +Date: Mon Jul 4 09:31:26 2016 +0200 + + No CIAO+DAnCE + * ACE/docs/Download.html: + +commit da68e30dd6e6939b6aade74c46e25ca8594d7182 +Author: Johnny Willemsen +Date: Mon Jul 4 08:58:23 2016 +0200 + + Prepare for next release + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: + +commit 58100d3aeae33252ad12446f620382734e8f02d2 +Author: INMarkus +Date: Tue Feb 23 11:39:20 2016 +0100 + + Update Time_Value_Test.cpp + + Added tests for setting of double values and to check performance of normalize for large numbers. + +commit 5f2fcf252b7b9790a2cb27e57f9d90ae7ea32f9e +Author: INMakrus +Date: Mon Feb 22 23:18:46 2016 +0100 + + Update Time_Value.cpp + + - Better performance by not using a loop for normalizing time values + +commit 53f4a8826c9002a81f8c37acee13778c3f6674d0 +Author: INMakrus +Date: Mon Feb 22 23:17:29 2016 +0100 + + Update Time_Value.inl + + - Handle big positiv and negativ double values by limiting them to possible values for sec and usec + - Correct round for negativ double values: -10.5 => -10 -500000 (not -10 -499999) + - no normalize needed cause result is already normalized diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 8eb9c59169e..20bd0d570d9 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -40,7 +40,7 @@ To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 6.4.0 + ACE VERSION: 6.4.1 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/VERSION b/ACE/VERSION index c369d605ae4..d215dcf5d17 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,4 +1,4 @@ -This is ACE version 6.4.0, released Mon Jul 04 08:47:38 CEST 2016 +This is ACE version 6.4.1, released Mon Oct 10 09:17:08 CEST 2016 If you have any problems with or questions about ACE, please send e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu), diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 64ff78ae92a..7877751d314 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,9 +4,9 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 4 -#define ACE_MICRO_VERSION 0 -#define ACE_BETA_VERSION 0 -#define ACE_VERSION "6.4.0" -#define ACE_VERSION_CODE 394240 +#define ACE_MICRO_VERSION 1 +#define ACE_BETA_VERSION 1 +#define ACE_VERSION "6.4.1" +#define ACE_VERSION_CODE 394241 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc index 13703a5419d..ba6e3794fe0 100644 --- a/ACE/debian/ace.dsc +++ b/ACE/debian/ace.dsc @@ -1,10 +1,10 @@ Format: 1.0 -Source: ACE+TAO-src-6.4.0 -Version: 2.4.0 +Source: ACE+TAO-src-6.4.1 +Version: 2.4.1 Binary: ace Maintainer: Johnny Willemsen Architecture: any Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev Files: - 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-6.4.0.tar.gz + 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-6.4.1.tar.gz diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index bbf1e371bc0..b243b513490 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/debian.control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-6.4.0 +Package: libace-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-6.4.0 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.4.1 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, libtao-dev, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-6.4.0 +Package: libace-ssl-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.0d), ${misc:Depends} +Depends: libace-ssl-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.1d), ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-6.4.0 +Package: libace-rmcast-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-6.4.0 +Package: libace-tmcast-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-6.4.0 +Package: libace-htbp-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-6.4.0 +Package: libace-inet-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-6.4.0 +Package: libace-inet-ssl-6.4.1 Architecture: any Section: libs -Depends: libace-inet-6.4.0, libace-ssl-6.4.0, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.4.0, libace-ssl-6.4.1, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-6.4.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.4.1 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -190,7 +190,7 @@ Description: ACE perfect hash function generator (transitional package) . It can be safely removed after installation. -Package: libacexml-6.4.0 +Package: libacexml-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -206,12 +206,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-6.4.0 +Package: libace-xml-utils-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -225,16 +225,16 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-6.4.0 +Package: libkokyu-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libtao-2.2.7, libtao-orbsvcs-2.4.0 +Suggests: libtao-2.2.7, libtao-orbsvcs-2.4.1 Description: ACE scheduling and dispatching library Kokyu is a library designed to provide flexible scheduling and dispatching services. @@ -245,12 +245,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-qtreactor-6.4.0 +Package: libace-qtreactor-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -269,12 +269,12 @@ Description: ACE-GUI reactor integration for Qt Package: libace-qtreactor-dev Architecture: any Section: libdevel -Depends: libace-qtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends} +Depends: libace-qtreactor-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends} Description: ACE-GUI reactor integration for Qt - development files This package contains header files and static library for the ACE-Qt reactor integration. -Package: libace-xtreactor-6.4.0 +Package: libace-xtreactor-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -292,12 +292,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.0), ${misc:Depends} +Depends: libace-xtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.1), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-6.4.0 +Package: libace-tkreactor-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -316,12 +316,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-6.4.0 +Package: libace-flreactor-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -339,12 +339,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.0), ${misc:Depends} +Depends: libace-flreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.1), ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-6.4.0 +Package: libace-foxreactor-6.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -361,12 +361,12 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. -Package: libtao-2.4.0 +Package: libtao-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -381,7 +381,7 @@ Package: libtao-dev Architecture: any Section: libdevel Replaces: libtao-orbsvcs-dev (<< 5.7.7-4) -Depends: libtao-2.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-2.4.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Suggests: libtao-doc, libtao-orbsvcs-dev Description: ACE based CORBA ORB core libraries - development files This package contains the header files for TAO. Due to the size of @@ -397,7 +397,7 @@ Description: ACE based CORBA ORB core libraries - documentation This package contains the TAO overview documentation, tutorials, examples, and information regarding upstream development. -Package: libtao-orbsvcs-2.4.0 +Package: libtao-orbsvcs-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -408,14 +408,14 @@ Package: libtao-orbsvcs-dev Architecture: any Section: libdevel Replaces: libtao-dev (<< 5.7.7-4) -Depends: libtao-orbsvcs-2.4.0 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-orbsvcs-2.4.1 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO CORBA services - development files This package contains the header files for the TAO CORBA services. . The examples and some documentation have been included as well, but the static libraries have been left out due to their size (over 400MB). -Package: libtao-qtresource-2.4.0 +Package: libtao-qtresource-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -426,12 +426,12 @@ Description: TAO-GUI reactor integration for Qt Package: libtao-qtresource-dev Architecture: any Section: libdevel -Depends: libtao-qtresource-2.4.0 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-qtresource-2.4.1 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Qt - development files This package contains header files and static library for the TAO-Qt reactor integration. -Package: libtao-xtresource-2.4.0 +Package: libtao-xtresource-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -442,12 +442,12 @@ Description: TAO-GUI reactor integration for Xt Package: libtao-xtresource-dev Architecture: any Section: libdevel -Depends: libtao-xtresource-2.4.0 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-xtresource-2.4.1 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Xt - development files This package contains header files and static library for the TAO-Xt reactor integration. -Package: libtao-flresource-2.4.0 +Package: libtao-flresource-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -458,12 +458,12 @@ Description: TAO-GUI reactor integration for FLTK Package: libtao-flresource-dev Architecture: any Section: libdevel -Depends: libtao-flresource-2.4.0 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-flresource-2.4.1 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for FLTK - development files This package contains header files and static library for the TAO-FLTK reactor integration. -Package: libtao-tkresource-2.4.0 +Package: libtao-tkresource-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -474,12 +474,12 @@ Description: TAO-GUI reactor integration for Tk Package: libtao-tkresource-dev Architecture: any Section: libdevel -Depends: libtao-tkresource-2.4.0 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-tkresource-2.4.1 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Tk - development files This package contains header files and static library for the TAO-Tk reactor integration. -Package: libtao-foxresource-2.4.0 +Package: libtao-foxresource-2.4.1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -490,14 +490,14 @@ Description: TAO-GUI reactor integration for FOX Package: libtao-foxresource-dev Architecture: any Section: libdevel -Depends: libtao-foxresource-2.4.0 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-foxresource-2.4.1 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for FOX - development files This package contains header files and static library for the TAO-FOX reactor integration. Package: tao-idl Architecture: any -Depends: g++, libtao-2.4.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: g++, libtao-2.4.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO IDL to C++ compiler This package provides an Interface Definition Language (IDL) to C++ compiler. @@ -507,7 +507,7 @@ Description: TAO IDL to C++ compiler Package: tao-ifr Architecture: any -Depends: g++, libtao-2.4.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: g++, libtao-2.4.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO interface repository CORBA-aware programs can contact an interface repository to get objects' interfaces at run-time. Then they can use the Dynamic diff --git a/ACE/debian/libace-6.4.0.docs b/ACE/debian/libace-6.4.0.docs deleted file mode 100644 index 3bdab5b0089..00000000000 --- a/ACE/debian/libace-6.4.0.docs +++ /dev/null @@ -1,8 +0,0 @@ -README -VERSION -AUTHORS -docs/FAQ -PROBLEM-REPORT-FORM -THANKS -VERSION -NEWS diff --git a/ACE/debian/libace-6.4.0.install b/ACE/debian/libace-6.4.0.install deleted file mode 100644 index d9afda38c12..00000000000 --- a/ACE/debian/libace-6.4.0.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/libACE-*.so -usr/lib/libACE_ETCL-*.so -usr/lib/libACE_Monitor_Control-*.so -usr/lib/libACE_ETCL_Parser-*.so diff --git a/ACE/debian/libace-6.4.0.lintian-overrides b/ACE/debian/libace-6.4.0.lintian-overrides deleted file mode 100644 index a734a623241..00000000000 --- a/ACE/debian/libace-6.4.0.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -libace-6.2.7: no-symbols-control-file usr/lib/libACE-6.2.7.so -libace-6.2.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.2.7.so -libace-6.2.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.2.7.so -libace-6.2.7: no-symbols-control-file usr/lib/libACE_ETCL-6.2.7.so diff --git a/ACE/debian/libace-6.4.1.docs b/ACE/debian/libace-6.4.1.docs new file mode 100644 index 00000000000..3bdab5b0089 --- /dev/null +++ b/ACE/debian/libace-6.4.1.docs @@ -0,0 +1,8 @@ +README +VERSION +AUTHORS +docs/FAQ +PROBLEM-REPORT-FORM +THANKS +VERSION +NEWS diff --git a/ACE/debian/libace-6.4.1.install b/ACE/debian/libace-6.4.1.install new file mode 100644 index 00000000000..d9afda38c12 --- /dev/null +++ b/ACE/debian/libace-6.4.1.install @@ -0,0 +1,4 @@ +usr/lib/libACE-*.so +usr/lib/libACE_ETCL-*.so +usr/lib/libACE_Monitor_Control-*.so +usr/lib/libACE_ETCL_Parser-*.so diff --git a/ACE/debian/libace-6.4.1.lintian-overrides b/ACE/debian/libace-6.4.1.lintian-overrides new file mode 100644 index 00000000000..a734a623241 --- /dev/null +++ b/ACE/debian/libace-6.4.1.lintian-overrides @@ -0,0 +1,4 @@ +libace-6.2.7: no-symbols-control-file usr/lib/libACE-6.2.7.so +libace-6.2.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.2.7.so +libace-6.2.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.2.7.so +libace-6.2.7: no-symbols-control-file usr/lib/libACE_ETCL-6.2.7.so diff --git a/ACE/debian/libace-flreactor-6.4.0.install b/ACE/debian/libace-flreactor-6.4.0.install deleted file mode 100644 index 528836aacee..00000000000 --- a/ACE/debian/libace-flreactor-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_FlReactor-*.so diff --git a/ACE/debian/libace-flreactor-6.4.0.lintian-overrides b/ACE/debian/libace-flreactor-6.4.0.lintian-overrides deleted file mode 100644 index 1b84bf197dc..00000000000 --- a/ACE/debian/libace-flreactor-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-flreactor-6.2.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.2.7.so diff --git a/ACE/debian/libace-flreactor-6.4.1.install b/ACE/debian/libace-flreactor-6.4.1.install new file mode 100644 index 00000000000..528836aacee --- /dev/null +++ b/ACE/debian/libace-flreactor-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_FlReactor-*.so diff --git a/ACE/debian/libace-flreactor-6.4.1.lintian-overrides b/ACE/debian/libace-flreactor-6.4.1.lintian-overrides new file mode 100644 index 00000000000..1b84bf197dc --- /dev/null +++ b/ACE/debian/libace-flreactor-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-flreactor-6.2.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.2.7.so diff --git a/ACE/debian/libace-foxreactor-6.4.0.install b/ACE/debian/libace-foxreactor-6.4.0.install deleted file mode 100644 index e360f29f5af..00000000000 --- a/ACE/debian/libace-foxreactor-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_FoxReactor-*.so diff --git a/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides deleted file mode 100644 index 7c835b9b8e0..00000000000 --- a/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-foxreactor-6.2.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.2.7.so diff --git a/ACE/debian/libace-foxreactor-6.4.1.install b/ACE/debian/libace-foxreactor-6.4.1.install new file mode 100644 index 00000000000..e360f29f5af --- /dev/null +++ b/ACE/debian/libace-foxreactor-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_FoxReactor-*.so diff --git a/ACE/debian/libace-foxreactor-6.4.1.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.1.lintian-overrides new file mode 100644 index 00000000000..7c835b9b8e0 --- /dev/null +++ b/ACE/debian/libace-foxreactor-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-foxreactor-6.2.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.2.7.so diff --git a/ACE/debian/libace-htbp-6.4.0.install b/ACE/debian/libace-htbp-6.4.0.install deleted file mode 100644 index 08103fd5cad..00000000000 --- a/ACE/debian/libace-htbp-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_HTBP-*.so diff --git a/ACE/debian/libace-htbp-6.4.0.lintian-overrides b/ACE/debian/libace-htbp-6.4.0.lintian-overrides deleted file mode 100644 index 63764ad81ee..00000000000 --- a/ACE/debian/libace-htbp-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-htbp-6.2.7: no-symbols-control-file usr/lib/libACE_HTBP-6.2.7.so diff --git a/ACE/debian/libace-htbp-6.4.1.install b/ACE/debian/libace-htbp-6.4.1.install new file mode 100644 index 00000000000..08103fd5cad --- /dev/null +++ b/ACE/debian/libace-htbp-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_HTBP-*.so diff --git a/ACE/debian/libace-htbp-6.4.1.lintian-overrides b/ACE/debian/libace-htbp-6.4.1.lintian-overrides new file mode 100644 index 00000000000..63764ad81ee --- /dev/null +++ b/ACE/debian/libace-htbp-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-htbp-6.2.7: no-symbols-control-file usr/lib/libACE_HTBP-6.2.7.so diff --git a/ACE/debian/libace-inet-6.4.0.install b/ACE/debian/libace-inet-6.4.0.install deleted file mode 100644 index 59a73a509d0..00000000000 --- a/ACE/debian/libace-inet-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_INet-*.so diff --git a/ACE/debian/libace-inet-6.4.0.lintian-overrides b/ACE/debian/libace-inet-6.4.0.lintian-overrides deleted file mode 100644 index a801058e382..00000000000 --- a/ACE/debian/libace-inet-6.4.0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libace-inet-6.2.7: extended-description-is-probably-too-short -libace-inet-6.2.7: no-symbols-control-file usr/lib/libACE_INet-6.2.7.so diff --git a/ACE/debian/libace-inet-6.4.1.install b/ACE/debian/libace-inet-6.4.1.install new file mode 100644 index 00000000000..59a73a509d0 --- /dev/null +++ b/ACE/debian/libace-inet-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_INet-*.so diff --git a/ACE/debian/libace-inet-6.4.1.lintian-overrides b/ACE/debian/libace-inet-6.4.1.lintian-overrides new file mode 100644 index 00000000000..a801058e382 --- /dev/null +++ b/ACE/debian/libace-inet-6.4.1.lintian-overrides @@ -0,0 +1,2 @@ +libace-inet-6.2.7: extended-description-is-probably-too-short +libace-inet-6.2.7: no-symbols-control-file usr/lib/libACE_INet-6.2.7.so diff --git a/ACE/debian/libace-inet-ssl-6.4.0.install b/ACE/debian/libace-inet-ssl-6.4.0.install deleted file mode 100644 index b9b8b9045f7..00000000000 --- a/ACE/debian/libace-inet-ssl-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_INet_SSL-*.so diff --git a/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides deleted file mode 100644 index c105861e8c8..00000000000 --- a/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-inet-ssl-6.2.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.2.7.so diff --git a/ACE/debian/libace-inet-ssl-6.4.1.install b/ACE/debian/libace-inet-ssl-6.4.1.install new file mode 100644 index 00000000000..b9b8b9045f7 --- /dev/null +++ b/ACE/debian/libace-inet-ssl-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_INet_SSL-*.so diff --git a/ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides new file mode 100644 index 00000000000..c105861e8c8 --- /dev/null +++ b/ACE/debian/libace-inet-ssl-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-inet-ssl-6.2.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.2.7.so diff --git a/ACE/debian/libace-qtreactor-6.4.0.install b/ACE/debian/libace-qtreactor-6.4.0.install deleted file mode 100644 index 1d371e1e571..00000000000 --- a/ACE/debian/libace-qtreactor-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_QtReactor-*.so diff --git a/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides deleted file mode 100644 index 08d9151dbd6..00000000000 --- a/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-qtreactor-6.2.7: no-symbols-control-file usr/lib/libACE_QtReactor-6.2.7.so diff --git a/ACE/debian/libace-qtreactor-6.4.1.install b/ACE/debian/libace-qtreactor-6.4.1.install new file mode 100644 index 00000000000..1d371e1e571 --- /dev/null +++ b/ACE/debian/libace-qtreactor-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_QtReactor-*.so diff --git a/ACE/debian/libace-qtreactor-6.4.1.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.1.lintian-overrides new file mode 100644 index 00000000000..08d9151dbd6 --- /dev/null +++ b/ACE/debian/libace-qtreactor-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-qtreactor-6.2.7: no-symbols-control-file usr/lib/libACE_QtReactor-6.2.7.so diff --git a/ACE/debian/libace-rmcast-6.4.0.install b/ACE/debian/libace-rmcast-6.4.0.install deleted file mode 100644 index 86e78259853..00000000000 --- a/ACE/debian/libace-rmcast-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_RMCast-*.so diff --git a/ACE/debian/libace-rmcast-6.4.0.lintian-overrides b/ACE/debian/libace-rmcast-6.4.0.lintian-overrides deleted file mode 100644 index 9644f06518a..00000000000 --- a/ACE/debian/libace-rmcast-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-rmcast-6.2.7: no-symbols-control-file usr/lib/libACE_RMCast-6.2.7.so diff --git a/ACE/debian/libace-rmcast-6.4.1.install b/ACE/debian/libace-rmcast-6.4.1.install new file mode 100644 index 00000000000..86e78259853 --- /dev/null +++ b/ACE/debian/libace-rmcast-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_RMCast-*.so diff --git a/ACE/debian/libace-rmcast-6.4.1.lintian-overrides b/ACE/debian/libace-rmcast-6.4.1.lintian-overrides new file mode 100644 index 00000000000..9644f06518a --- /dev/null +++ b/ACE/debian/libace-rmcast-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-rmcast-6.2.7: no-symbols-control-file usr/lib/libACE_RMCast-6.2.7.so diff --git a/ACE/debian/libace-ssl-6.4.0.NEWS b/ACE/debian/libace-ssl-6.4.0.NEWS deleted file mode 100644 index e5bd0e4aa10..00000000000 --- a/ACE/debian/libace-ssl-6.4.0.NEWS +++ /dev/null @@ -1,11 +0,0 @@ -ace (6.0.1-2) unstable; urgency=low - - As of ace 6.0.1-2, SSLv2 support was removed from Debian ACE+TAO - packages. This follows change introduced in openssl 1.0.0c-2. - - WARNING: it means existing ACE-based software will default to SSL v3 - instead of SSL v2 without warning. Recompiling software explicitly - using SSL v2 will fail since the ACE_SSL_Context::SSLv2_* enums got - removed. - - -- Thomas Girard Sat, 11 Jun 2011 18:51:20 +0200 diff --git a/ACE/debian/libace-ssl-6.4.0.install b/ACE/debian/libace-ssl-6.4.0.install deleted file mode 100644 index 8df45a6d55f..00000000000 --- a/ACE/debian/libace-ssl-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_SSL-*.so diff --git a/ACE/debian/libace-ssl-6.4.0.lintian-overrides b/ACE/debian/libace-ssl-6.4.0.lintian-overrides deleted file mode 100644 index e8ea7ddcf34..00000000000 --- a/ACE/debian/libace-ssl-6.4.0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libace-ssl-6.2.7: extended-description-is-probably-too-short -libace-ssl-6.2.7: no-symbols-control-file usr/lib/libACE_SSL-6.2.7.so diff --git a/ACE/debian/libace-ssl-6.4.1.NEWS b/ACE/debian/libace-ssl-6.4.1.NEWS new file mode 100644 index 00000000000..e5bd0e4aa10 --- /dev/null +++ b/ACE/debian/libace-ssl-6.4.1.NEWS @@ -0,0 +1,11 @@ +ace (6.0.1-2) unstable; urgency=low + + As of ace 6.0.1-2, SSLv2 support was removed from Debian ACE+TAO + packages. This follows change introduced in openssl 1.0.0c-2. + + WARNING: it means existing ACE-based software will default to SSL v3 + instead of SSL v2 without warning. Recompiling software explicitly + using SSL v2 will fail since the ACE_SSL_Context::SSLv2_* enums got + removed. + + -- Thomas Girard Sat, 11 Jun 2011 18:51:20 +0200 diff --git a/ACE/debian/libace-ssl-6.4.1.install b/ACE/debian/libace-ssl-6.4.1.install new file mode 100644 index 00000000000..8df45a6d55f --- /dev/null +++ b/ACE/debian/libace-ssl-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_SSL-*.so diff --git a/ACE/debian/libace-ssl-6.4.1.lintian-overrides b/ACE/debian/libace-ssl-6.4.1.lintian-overrides new file mode 100644 index 00000000000..e8ea7ddcf34 --- /dev/null +++ b/ACE/debian/libace-ssl-6.4.1.lintian-overrides @@ -0,0 +1,2 @@ +libace-ssl-6.2.7: extended-description-is-probably-too-short +libace-ssl-6.2.7: no-symbols-control-file usr/lib/libACE_SSL-6.2.7.so diff --git a/ACE/debian/libace-tkreactor-6.4.0.install b/ACE/debian/libace-tkreactor-6.4.0.install deleted file mode 100644 index 12ab35062d2..00000000000 --- a/ACE/debian/libace-tkreactor-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_TkReactor-*.so diff --git a/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides deleted file mode 100644 index 0be73cb750c..00000000000 --- a/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tkreactor-6.2.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.2.7.so diff --git a/ACE/debian/libace-tkreactor-6.4.1.install b/ACE/debian/libace-tkreactor-6.4.1.install new file mode 100644 index 00000000000..12ab35062d2 --- /dev/null +++ b/ACE/debian/libace-tkreactor-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_TkReactor-*.so diff --git a/ACE/debian/libace-tkreactor-6.4.1.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.1.lintian-overrides new file mode 100644 index 00000000000..0be73cb750c --- /dev/null +++ b/ACE/debian/libace-tkreactor-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-tkreactor-6.2.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.2.7.so diff --git a/ACE/debian/libace-tmcast-6.4.0.install b/ACE/debian/libace-tmcast-6.4.0.install deleted file mode 100644 index e066131dea0..00000000000 --- a/ACE/debian/libace-tmcast-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_TMCast-*.so diff --git a/ACE/debian/libace-tmcast-6.4.0.lintian-overrides b/ACE/debian/libace-tmcast-6.4.0.lintian-overrides deleted file mode 100644 index 42c1086a791..00000000000 --- a/ACE/debian/libace-tmcast-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tmcast-6.2.7: no-symbols-control-file usr/lib/libACE_TMCast-6.2.7.so diff --git a/ACE/debian/libace-tmcast-6.4.1.install b/ACE/debian/libace-tmcast-6.4.1.install new file mode 100644 index 00000000000..e066131dea0 --- /dev/null +++ b/ACE/debian/libace-tmcast-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_TMCast-*.so diff --git a/ACE/debian/libace-tmcast-6.4.1.lintian-overrides b/ACE/debian/libace-tmcast-6.4.1.lintian-overrides new file mode 100644 index 00000000000..42c1086a791 --- /dev/null +++ b/ACE/debian/libace-tmcast-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-tmcast-6.2.7: no-symbols-control-file usr/lib/libACE_TMCast-6.2.7.so diff --git a/ACE/debian/libace-xml-utils-6.4.0.install b/ACE/debian/libace-xml-utils-6.4.0.install deleted file mode 100644 index 2428ec9f109..00000000000 --- a/ACE/debian/libace-xml-utils-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_XML_Utils-*.so diff --git a/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides deleted file mode 100644 index c6d67613a41..00000000000 --- a/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xml-utils-6.2.7: extended-description-is-probably-too-short diff --git a/ACE/debian/libace-xml-utils-6.4.1.install b/ACE/debian/libace-xml-utils-6.4.1.install new file mode 100644 index 00000000000..2428ec9f109 --- /dev/null +++ b/ACE/debian/libace-xml-utils-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_XML_Utils-*.so diff --git a/ACE/debian/libace-xml-utils-6.4.1.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.1.lintian-overrides new file mode 100644 index 00000000000..c6d67613a41 --- /dev/null +++ b/ACE/debian/libace-xml-utils-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-xml-utils-6.2.7: extended-description-is-probably-too-short diff --git a/ACE/debian/libace-xtreactor-6.4.0.install b/ACE/debian/libace-xtreactor-6.4.0.install deleted file mode 100644 index c53614c7208..00000000000 --- a/ACE/debian/libace-xtreactor-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_XtReactor-*.so diff --git a/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides deleted file mode 100644 index 3bb1f71096e..00000000000 --- a/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xtreactor-6.2.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.2.7.so diff --git a/ACE/debian/libace-xtreactor-6.4.1.install b/ACE/debian/libace-xtreactor-6.4.1.install new file mode 100644 index 00000000000..c53614c7208 --- /dev/null +++ b/ACE/debian/libace-xtreactor-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libACE_XtReactor-*.so diff --git a/ACE/debian/libace-xtreactor-6.4.1.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.1.lintian-overrides new file mode 100644 index 00000000000..3bb1f71096e --- /dev/null +++ b/ACE/debian/libace-xtreactor-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libace-xtreactor-6.2.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.2.7.so diff --git a/ACE/debian/libacexml-6.4.0.docs b/ACE/debian/libacexml-6.4.0.docs deleted file mode 100644 index 002855d7915..00000000000 --- a/ACE/debian/libacexml-6.4.0.docs +++ /dev/null @@ -1 +0,0 @@ -ACEXML/README diff --git a/ACE/debian/libacexml-6.4.0.install b/ACE/debian/libacexml-6.4.0.install deleted file mode 100644 index d3e912ffa51..00000000000 --- a/ACE/debian/libacexml-6.4.0.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so -usr/lib/libACEXML-*.so -usr/lib/libACEXML_Parser-*.so diff --git a/ACE/debian/libacexml-6.4.0.lintian-overrides b/ACE/debian/libacexml-6.4.0.lintian-overrides deleted file mode 100644 index 90f4b3eb86c..00000000000 --- a/ACE/debian/libacexml-6.4.0.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.2.7.so -libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.2.7.so -libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML-6.2.7.so diff --git a/ACE/debian/libacexml-6.4.1.docs b/ACE/debian/libacexml-6.4.1.docs new file mode 100644 index 00000000000..002855d7915 --- /dev/null +++ b/ACE/debian/libacexml-6.4.1.docs @@ -0,0 +1 @@ +ACEXML/README diff --git a/ACE/debian/libacexml-6.4.1.install b/ACE/debian/libacexml-6.4.1.install new file mode 100644 index 00000000000..d3e912ffa51 --- /dev/null +++ b/ACE/debian/libacexml-6.4.1.install @@ -0,0 +1,3 @@ +usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so +usr/lib/libACEXML-*.so +usr/lib/libACEXML_Parser-*.so diff --git a/ACE/debian/libacexml-6.4.1.lintian-overrides b/ACE/debian/libacexml-6.4.1.lintian-overrides new file mode 100644 index 00000000000..90f4b3eb86c --- /dev/null +++ b/ACE/debian/libacexml-6.4.1.lintian-overrides @@ -0,0 +1,3 @@ +libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.2.7.so +libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.2.7.so +libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML-6.2.7.so diff --git a/ACE/debian/libkokyu-6.4.0.docs b/ACE/debian/libkokyu-6.4.0.docs deleted file mode 100644 index e8869c513b2..00000000000 --- a/ACE/debian/libkokyu-6.4.0.docs +++ /dev/null @@ -1 +0,0 @@ -Kokyu/README diff --git a/ACE/debian/libkokyu-6.4.0.install b/ACE/debian/libkokyu-6.4.0.install deleted file mode 100644 index 62854308f96..00000000000 --- a/ACE/debian/libkokyu-6.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libKokyu-*.so diff --git a/ACE/debian/libkokyu-6.4.0.lintian-overrides b/ACE/debian/libkokyu-6.4.0.lintian-overrides deleted file mode 100644 index b01f2e10dfd..00000000000 --- a/ACE/debian/libkokyu-6.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libkokyu-6.2.7: no-symbols-control-file usr/lib/libKokyu-6.2.7.so diff --git a/ACE/debian/libkokyu-6.4.1.docs b/ACE/debian/libkokyu-6.4.1.docs new file mode 100644 index 00000000000..e8869c513b2 --- /dev/null +++ b/ACE/debian/libkokyu-6.4.1.docs @@ -0,0 +1 @@ +Kokyu/README diff --git a/ACE/debian/libkokyu-6.4.1.install b/ACE/debian/libkokyu-6.4.1.install new file mode 100644 index 00000000000..62854308f96 --- /dev/null +++ b/ACE/debian/libkokyu-6.4.1.install @@ -0,0 +1 @@ +usr/lib/libKokyu-*.so diff --git a/ACE/debian/libkokyu-6.4.1.lintian-overrides b/ACE/debian/libkokyu-6.4.1.lintian-overrides new file mode 100644 index 00000000000..b01f2e10dfd --- /dev/null +++ b/ACE/debian/libkokyu-6.4.1.lintian-overrides @@ -0,0 +1 @@ +libkokyu-6.2.7: no-symbols-control-file usr/lib/libKokyu-6.2.7.so diff --git a/ACE/debian/libtao-2.4.0.docs b/ACE/debian/libtao-2.4.0.docs deleted file mode 100644 index 803353aba72..00000000000 --- a/ACE/debian/libtao-2.4.0.docs +++ /dev/null @@ -1,4 +0,0 @@ -README -VERSION -PROBLEM-REPORT-FORM -NEWS diff --git a/ACE/debian/libtao-2.4.0.install b/ACE/debian/libtao-2.4.0.install deleted file mode 100644 index a9643d351fb..00000000000 --- a/ACE/debian/libtao-2.4.0.install +++ /dev/null @@ -1,42 +0,0 @@ -usr/lib/libTAO-*.so -usr/lib/libTAO_AnyTypeCode-*.so -usr/lib/libTAO_BiDirGIOP-*.so -usr/lib/libTAO_CodecFactory-*.so -usr/lib/libTAO_Codeset-*.so -usr/lib/libTAO_Compression-*.so -usr/lib/libTAO_CSD_Framework-*.so -usr/lib/libTAO_CSD_ThreadPool-*.so -usr/lib/libTAO_DynamicAny-*.so -usr/lib/libTAO_DynamicInterface-*.so -usr/lib/libTAO_EndpointPolicy-*.so -usr/lib/libTAO_IFR_Client-*.so -usr/lib/libTAO_IFR_Client_skel-*.so -usr/lib/libTAO_IORInterceptor-*.so -usr/lib/libTAO_IORManip-*.so -usr/lib/libTAO_IORTable-*.so -usr/lib/libTAO_Async_IORTable-*.so -usr/lib/libTAO_Messaging-*.so -usr/lib/libTAO_ObjRefTemplate-*.so -usr/lib/libTAO_PI-*.so -usr/lib/libTAO_PI_Server-*.so -usr/lib/libTAO_PortableServer-*.so -usr/lib/libTAO_RTCORBA-*.so -usr/lib/libTAO_RTPortableServer-*.so -usr/lib/libTAO_RTScheduler-*.so -usr/lib/libTAO_SmartProxies-*.so -usr/lib/libTAO_Strategies-*.so -usr/lib/libTAO_TC-*.so -usr/lib/libTAO_TC_IIOP-*.so -usr/lib/libTAO_TypeCodeFactory-*.so -usr/lib/libTAO_Utils-*.so -usr/lib/libTAO_Valuetype-*.so -usr/lib/libTAO_ImR_Client-*.so -usr/lib/libTAO_DiffServPolicy-*.so -usr/lib/libTAO_ZlibCompressor-*.so -usr/lib/libTAO_Bzip2Compressor-*.so -usr/lib/libTAO_IFR_BE-*.so -usr/lib/libTAO_IDL_FE-*.so -usr/lib/libTAO_IDL_BE-*.so -usr/lib/libTAO_ZIOP-*.so -usr/lib/libTAO_ETCL-*.so -usr/lib/libTAO_Monitor-*.so diff --git a/ACE/debian/libtao-2.4.0.lintian-overrides b/ACE/debian/libtao-2.4.0.lintian-overrides deleted file mode 100644 index 77cc51ec2ff..00000000000 --- a/ACE/debian/libtao-2.4.0.lintian-overrides +++ /dev/null @@ -1,46 +0,0 @@ -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTScheduler-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Client-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CSD_ThreadPool-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Async_IORTable-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_EndpointPolicy-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_BE-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_LzoCompressor-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_Client-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IDL_FE-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORInterceptor-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Compression-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_AnyTypeCode-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IDL_BE-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Codeset-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Messaging-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_Client_skel-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Strategies-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORTable-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Bzip2Compressor-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ZlibCompressor-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Monitor-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Utils-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DynamicInterface-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_BiDirGIOP-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ObjRefTemplate-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ETCL-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORManip-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CodecFactory-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ZIOP-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PortableServer-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CSD_Framework-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTPortableServer-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TC_IIOP-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_SmartProxies-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PI_Server-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TypeCodeFactory-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DynamicAny-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTCORBA-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TC-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DiffServPolicy-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Valuetype-2.2.7.so -libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PI-2.2.7.so - -# False positive, it's an exit() call in a Lex-generated parser -libtao-2.2.7: shlib-calls-exit usr/lib/libTAO_IDL_FE-2.2.7.so diff --git a/ACE/debian/libtao-2.4.1.docs b/ACE/debian/libtao-2.4.1.docs new file mode 100644 index 00000000000..803353aba72 --- /dev/null +++ b/ACE/debian/libtao-2.4.1.docs @@ -0,0 +1,4 @@ +README +VERSION +PROBLEM-REPORT-FORM +NEWS diff --git a/ACE/debian/libtao-2.4.1.install b/ACE/debian/libtao-2.4.1.install new file mode 100644 index 00000000000..a9643d351fb --- /dev/null +++ b/ACE/debian/libtao-2.4.1.install @@ -0,0 +1,42 @@ +usr/lib/libTAO-*.so +usr/lib/libTAO_AnyTypeCode-*.so +usr/lib/libTAO_BiDirGIOP-*.so +usr/lib/libTAO_CodecFactory-*.so +usr/lib/libTAO_Codeset-*.so +usr/lib/libTAO_Compression-*.so +usr/lib/libTAO_CSD_Framework-*.so +usr/lib/libTAO_CSD_ThreadPool-*.so +usr/lib/libTAO_DynamicAny-*.so +usr/lib/libTAO_DynamicInterface-*.so +usr/lib/libTAO_EndpointPolicy-*.so +usr/lib/libTAO_IFR_Client-*.so +usr/lib/libTAO_IFR_Client_skel-*.so +usr/lib/libTAO_IORInterceptor-*.so +usr/lib/libTAO_IORManip-*.so +usr/lib/libTAO_IORTable-*.so +usr/lib/libTAO_Async_IORTable-*.so +usr/lib/libTAO_Messaging-*.so +usr/lib/libTAO_ObjRefTemplate-*.so +usr/lib/libTAO_PI-*.so +usr/lib/libTAO_PI_Server-*.so +usr/lib/libTAO_PortableServer-*.so +usr/lib/libTAO_RTCORBA-*.so +usr/lib/libTAO_RTPortableServer-*.so +usr/lib/libTAO_RTScheduler-*.so +usr/lib/libTAO_SmartProxies-*.so +usr/lib/libTAO_Strategies-*.so +usr/lib/libTAO_TC-*.so +usr/lib/libTAO_TC_IIOP-*.so +usr/lib/libTAO_TypeCodeFactory-*.so +usr/lib/libTAO_Utils-*.so +usr/lib/libTAO_Valuetype-*.so +usr/lib/libTAO_ImR_Client-*.so +usr/lib/libTAO_DiffServPolicy-*.so +usr/lib/libTAO_ZlibCompressor-*.so +usr/lib/libTAO_Bzip2Compressor-*.so +usr/lib/libTAO_IFR_BE-*.so +usr/lib/libTAO_IDL_FE-*.so +usr/lib/libTAO_IDL_BE-*.so +usr/lib/libTAO_ZIOP-*.so +usr/lib/libTAO_ETCL-*.so +usr/lib/libTAO_Monitor-*.so diff --git a/ACE/debian/libtao-2.4.1.lintian-overrides b/ACE/debian/libtao-2.4.1.lintian-overrides new file mode 100644 index 00000000000..77cc51ec2ff --- /dev/null +++ b/ACE/debian/libtao-2.4.1.lintian-overrides @@ -0,0 +1,46 @@ +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTScheduler-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Client-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CSD_ThreadPool-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Async_IORTable-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_EndpointPolicy-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_BE-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_LzoCompressor-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_Client-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IDL_FE-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORInterceptor-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Compression-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_AnyTypeCode-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IDL_BE-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Codeset-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Messaging-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_Client_skel-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Strategies-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORTable-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Bzip2Compressor-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ZlibCompressor-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Monitor-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Utils-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DynamicInterface-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_BiDirGIOP-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ObjRefTemplate-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ETCL-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORManip-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CodecFactory-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ZIOP-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PortableServer-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CSD_Framework-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTPortableServer-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TC_IIOP-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_SmartProxies-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PI_Server-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TypeCodeFactory-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DynamicAny-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTCORBA-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TC-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DiffServPolicy-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Valuetype-2.2.7.so +libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PI-2.2.7.so + +# False positive, it's an exit() call in a Lex-generated parser +libtao-2.2.7: shlib-calls-exit usr/lib/libTAO_IDL_FE-2.2.7.so diff --git a/ACE/debian/libtao-flresource-2.4.0.install b/ACE/debian/libtao-flresource-2.4.0.install deleted file mode 100644 index 5d4ee6ce57a..00000000000 --- a/ACE/debian/libtao-flresource-2.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libTAO_FlResource-*.so diff --git a/ACE/debian/libtao-flresource-2.4.0.lintian-overrides b/ACE/debian/libtao-flresource-2.4.0.lintian-overrides deleted file mode 100644 index 28b7907f70b..00000000000 --- a/ACE/debian/libtao-flresource-2.4.0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libtao-flresource-2.2.7: extended-description-is-probably-too-short -libtao-flresource-2.2.7: no-symbols-control-file usr/lib/libTAO_FlResource-2.2.7.so diff --git a/ACE/debian/libtao-flresource-2.4.1.install b/ACE/debian/libtao-flresource-2.4.1.install new file mode 100644 index 00000000000..5d4ee6ce57a --- /dev/null +++ b/ACE/debian/libtao-flresource-2.4.1.install @@ -0,0 +1 @@ +usr/lib/libTAO_FlResource-*.so diff --git a/ACE/debian/libtao-flresource-2.4.1.lintian-overrides b/ACE/debian/libtao-flresource-2.4.1.lintian-overrides new file mode 100644 index 00000000000..28b7907f70b --- /dev/null +++ b/ACE/debian/libtao-flresource-2.4.1.lintian-overrides @@ -0,0 +1,2 @@ +libtao-flresource-2.2.7: extended-description-is-probably-too-short +libtao-flresource-2.2.7: no-symbols-control-file usr/lib/libTAO_FlResource-2.2.7.so diff --git a/ACE/debian/libtao-foxresource-2.4.0.install b/ACE/debian/libtao-foxresource-2.4.0.install deleted file mode 100644 index 6ceb47601aa..00000000000 --- a/ACE/debian/libtao-foxresource-2.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libTAO_FoxResource-*.so diff --git a/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides b/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides deleted file mode 100644 index 0e291526088..00000000000 --- a/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libtao-foxresource-2.2.7: extended-description-is-probably-too-short -libtao-foxresource-2.2.7: no-symbols-control-file usr/lib/libTAO_FoxResource-2.2.7.so diff --git a/ACE/debian/libtao-foxresource-2.4.1.install b/ACE/debian/libtao-foxresource-2.4.1.install new file mode 100644 index 00000000000..6ceb47601aa --- /dev/null +++ b/ACE/debian/libtao-foxresource-2.4.1.install @@ -0,0 +1 @@ +usr/lib/libTAO_FoxResource-*.so diff --git a/ACE/debian/libtao-foxresource-2.4.1.lintian-overrides b/ACE/debian/libtao-foxresource-2.4.1.lintian-overrides new file mode 100644 index 00000000000..0e291526088 --- /dev/null +++ b/ACE/debian/libtao-foxresource-2.4.1.lintian-overrides @@ -0,0 +1,2 @@ +libtao-foxresource-2.2.7: extended-description-is-probably-too-short +libtao-foxresource-2.2.7: no-symbols-control-file usr/lib/libTAO_FoxResource-2.2.7.so diff --git a/ACE/debian/libtao-orbsvcs-2.4.0.NEWS b/ACE/debian/libtao-orbsvcs-2.4.0.NEWS deleted file mode 100644 index ea0759e0ade..00000000000 --- a/ACE/debian/libtao-orbsvcs-2.4.0.NEWS +++ /dev/null @@ -1,6 +0,0 @@ -ace (5.4.7-11) unstable; urgency=low - - The libtao-orbsvcs1.4.7c2a package was split into smaller packages. - Please install the tao-* packages that suit your needs. - - -- Thomas Girard Sat, 23 Sep 2006 09:47:01 +0200 diff --git a/ACE/debian/libtao-orbsvcs-2.4.0.install b/ACE/debian/libtao-orbsvcs-2.4.0.install deleted file mode 100644 index 270eb6a9174..00000000000 --- a/ACE/debian/libtao-orbsvcs-2.4.0.install +++ /dev/null @@ -1,69 +0,0 @@ -usr/lib/libTAO_AV-*.so -usr/lib/libTAO_CosConcurrency-*.so -usr/lib/libTAO_CosConcurrency_Skel-*.so -usr/lib/libTAO_CosConcurrency_Serv-*.so -usr/lib/libTAO_CosEvent-*.so -usr/lib/libTAO_CosEvent_Skel-*.so -usr/lib/libTAO_CosEvent_Serv-*.so -usr/lib/libTAO_CosLifeCycle-*.so -usr/lib/libTAO_CosLoadBalancing-*.so -usr/lib/libTAO_CosNaming-*.so -usr/lib/libTAO_CosNaming_Skel-*.so -usr/lib/libTAO_CosNaming_Serv-*.so -usr/lib/libTAO_CosNotification-*.so -usr/lib/libTAO_CosNotification_Persist-*.so -usr/lib/libTAO_CosNotification_Skel-*.so -usr/lib/libTAO_CosNotification_Serv-*.so -usr/lib/libTAO_CosNotification_MC-*.so -usr/lib/libTAO_CosNotification_MC_Ext-*.so -usr/lib/libTAO_CosProperty-*.so -usr/lib/libTAO_CosProperty_Skel-*.so -usr/lib/libTAO_CosProperty_Serv-*.so -usr/lib/libTAO_CosTime-*.so -usr/lib/libTAO_CosTrading-*.so -usr/lib/libTAO_CosTrading_Skel-*.so -usr/lib/libTAO_CosTrading_Serv-*.so -usr/lib/libTAO_CosLifeCycle_Skel-*.so -usr/lib/libTAO_DsEventLogAdmin-*.so -usr/lib/libTAO_DsEventLogAdmin_Skel-*.so -usr/lib/libTAO_DsEventLogAdmin_Serv-*.so -usr/lib/libTAO_DsLogAdmin-*.so -usr/lib/libTAO_DsLogAdmin_Skel-*.so -usr/lib/libTAO_DsLogAdmin_Serv-*.so -usr/lib/libTAO_DsNotifyLogAdmin-*.so -usr/lib/libTAO_DsNotifyLogAdmin_Skel-*.so -usr/lib/libTAO_DsNotifyLogAdmin_Serv-*.so -usr/lib/libTAO_FaultTolerance-*.so -usr/lib/libTAO_FT_ClientORB-*.so -usr/lib/libTAO_FT_ServerORB-*.so -usr/lib/libTAO_FTORB_Utils-*.so -usr/lib/libTAO_FTRT_EventChannel-*.so -usr/lib/libTAO_FtRtEvent-*.so -usr/lib/libTAO_FTRT_ClientORB-*.so -usr/lib/libTAO_HTIOP-*.so -usr/lib/libTAO_IFRService-*.so -usr/lib/libTAO_PortableGroup-*.so -usr/lib/libTAO_RTCORBAEvent-*.so -usr/lib/libTAO_RTEvent-*.so -usr/lib/libTAO_RTEvent_Serv-*.so -usr/lib/libTAO_RTEvent_Skel-*.so -usr/lib/libTAO_RTEventLogAdmin-*.so -usr/lib/libTAO_RTEventLogAdmin_Skel-*.so -usr/lib/libTAO_RTEventLogAdmin_Serv-*.so -usr/lib/libTAO_RTKokyuEvent-*.so -usr/lib/libTAO_RTSched-*.so -usr/lib/libTAO_RTSchedEvent-*.so -usr/lib/libTAO_RT_Notification-*.so -usr/lib/libTAO_SSLIOP-*.so -usr/lib/libTAO_Security-*.so -usr/lib/libTAO_Svc_Utils-*.so -usr/lib/libTAO_Notify_Service-*.so -usr/lib/libTAO_CosTime_Serv-*.so -usr/lib/libTAO_CosTime_Skel-*.so -usr/lib/libTAO_Catior_i-*.so -usr/lib/libTAO_ImR_Locator_IDL-*.so -usr/lib/libTAO_ImR_Activator-*.so -usr/lib/libTAO_Async_ImR_Client_IDL-*.so -usr/lib/libTAO_ReplicationManagerLib-*.so -usr/lib/libTAO_ImR_Activator_IDL-*.so -usr/lib/libTAO_ImR_Locator-*.so diff --git a/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides b/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides deleted file mode 100644 index 8f357d027bf..00000000000 --- a/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides +++ /dev/null @@ -1,71 +0,0 @@ -libtao-orbsvcs-2.2.7: package-name-doesnt-match-sonames libTAO-AV-2.2.7 libTAO-Async-ImR-Client-IDL-2.2.7 libTAO-Catior-i-2.2.7 libTAO-CosConcurrency-2.2.7 libTAO-CosConcurrency-Serv-2.2.7 libTAO-CosConcurrency-Skel-2.2.7 libTAO-CosEvent-2.2.7 libTAO-CosEvent-Serv-2.2.7 libTAO-CosEvent-Skel-2.2.7 libTAO-CosLifeCycle-2.2.7 libTAO-CosLifeCycle-Skel-2.2.7 libTAO-CosLoadBalancing-2.2.7 libTAO-CosNaming-2.2.7 libTAO-CosNaming-Serv-2.2.7 libTAO-CosNaming-Skel-2.2.7 libTAO-CosNotification-2.2.7 libTAO-CosNotification-MC-2.2.7 libTAO-CosNotification-MC-Ext-2.2.7 libTAO-CosNotification-Persist-2.2.7 libTAO-CosNotification-Serv-2.2.7 libTAO-CosNotification-Skel-2.2.7 libTAO-CosProperty-2.2.7 libTAO-CosProperty-Serv-2.2.7 libTAO-CosProperty-Skel-2.2.7 libTAO-CosTime-2.2.7 libTAO-CosTime-Serv-2.2.7 libTAO-CosTime-Skel-2.2.7 libTAO-CosTrading-2.2.7 libTAO-CosTrading-Serv-2.2.7 libTAO-CosTrading-Skel-2.2.7 libTAO-DsEventLogAdmin-2.2.7 libTAO-DsEventLogAdmin-Serv-2.2.7 libTAO-DsEventLogAdmin-Skel-2.2.7 libTAO-DsLogAdmin-2.2.7 libTAO-DsLogAdmin-Serv-2.2.7 libTAO-DsLogAdmin-Skel-2.2.7 libTAO-DsNotifyLogAdmin-2.2.7 libTAO-DsNotifyLogAdmin-Serv-2.2.7 libTAO-DsNotifyLogAdmin-Skel-2.2.7 libTAO-FTORB-Utils-2.2.7 libTAO-FTRT-ClientORB-2.2.7 libTAO-FTRT-EventChannel-2.2.7 libTAO-FT-ClientORB-2.2.7 libTAO-FT-ServerORB-2.2.7 libTAO-FaultTolerance-2.2.7 libTAO-FtRtEvent-2.2.7 libTAO-HTIOP-2.2.7 libTAO-IFRService-2.2.7 libTAO-ImR-Activator-2.2.7 libTAO-ImR-Activator-IDL-2.2.7 libTAO-ImR-Locator-2.2.7 libTAO-ImR-Locator-IDL-2.2.7 libTAO-Notify-Service-2.2.7 libTAO-PortableGroup-2.2.7 libTAO-RTCORBAEvent-2.2.7 libTAO-RTEvent-2.2.7 libTAO-RTEventLogAdmin-2.2.7 libTAO-RTEventLogAdmin-Serv-2.2.7 libTAO-RTEventLogAdmin-Skel-2.2.7 libTAO-RTEvent-Serv-2.2.7 libTAO-RTEvent-Skel-2.2.7 libTAO-RTKokyuEvent-2.2.7 libTAO-RTSched-2.2.7 libTAO-RTSchedEvent-2.2.7 libTAO-RT-Notification-2.2.7 libTAO-ReplicationManagerLib-2.2.7 libTAO-SSLIOP-2.2.7 libTAO-Security-2.2.7 libTAO-Svc-Utils-2.2.7 -libtao-orbsvcs-2.2.7: extended-description-is-probably-too-short -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLifeCycle_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FtRtEvent-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Locator-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ReplicationManagerLib-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLoadBalancing-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_AV-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTORB_Utils-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTSchedEvent-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Activator-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Activator_IDL-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTCORBAEvent-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Locator_IDL-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Notify_Service-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FT_ServerORB-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLifeCycle-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Persist-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Catior_i-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTRT_ClientORB-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Security-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_MC_Ext-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_HTIOP-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_IFRService-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Async_ImR_Client_IDL-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Svc_Utils-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent_Serv-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_PortableGroup-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RT_Notification-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FaultTolerance-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTKokyuEvent-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FT_ClientORB-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTRT_EventChannel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_SSLIOP-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency_Skel-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_MC-2.2.7.so -libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTSched-2.2.7.so diff --git a/ACE/debian/libtao-orbsvcs-2.4.1.NEWS b/ACE/debian/libtao-orbsvcs-2.4.1.NEWS new file mode 100644 index 00000000000..ea0759e0ade --- /dev/null +++ b/ACE/debian/libtao-orbsvcs-2.4.1.NEWS @@ -0,0 +1,6 @@ +ace (5.4.7-11) unstable; urgency=low + + The libtao-orbsvcs1.4.7c2a package was split into smaller packages. + Please install the tao-* packages that suit your needs. + + -- Thomas Girard Sat, 23 Sep 2006 09:47:01 +0200 diff --git a/ACE/debian/libtao-orbsvcs-2.4.1.install b/ACE/debian/libtao-orbsvcs-2.4.1.install new file mode 100644 index 00000000000..270eb6a9174 --- /dev/null +++ b/ACE/debian/libtao-orbsvcs-2.4.1.install @@ -0,0 +1,69 @@ +usr/lib/libTAO_AV-*.so +usr/lib/libTAO_CosConcurrency-*.so +usr/lib/libTAO_CosConcurrency_Skel-*.so +usr/lib/libTAO_CosConcurrency_Serv-*.so +usr/lib/libTAO_CosEvent-*.so +usr/lib/libTAO_CosEvent_Skel-*.so +usr/lib/libTAO_CosEvent_Serv-*.so +usr/lib/libTAO_CosLifeCycle-*.so +usr/lib/libTAO_CosLoadBalancing-*.so +usr/lib/libTAO_CosNaming-*.so +usr/lib/libTAO_CosNaming_Skel-*.so +usr/lib/libTAO_CosNaming_Serv-*.so +usr/lib/libTAO_CosNotification-*.so +usr/lib/libTAO_CosNotification_Persist-*.so +usr/lib/libTAO_CosNotification_Skel-*.so +usr/lib/libTAO_CosNotification_Serv-*.so +usr/lib/libTAO_CosNotification_MC-*.so +usr/lib/libTAO_CosNotification_MC_Ext-*.so +usr/lib/libTAO_CosProperty-*.so +usr/lib/libTAO_CosProperty_Skel-*.so +usr/lib/libTAO_CosProperty_Serv-*.so +usr/lib/libTAO_CosTime-*.so +usr/lib/libTAO_CosTrading-*.so +usr/lib/libTAO_CosTrading_Skel-*.so +usr/lib/libTAO_CosTrading_Serv-*.so +usr/lib/libTAO_CosLifeCycle_Skel-*.so +usr/lib/libTAO_DsEventLogAdmin-*.so +usr/lib/libTAO_DsEventLogAdmin_Skel-*.so +usr/lib/libTAO_DsEventLogAdmin_Serv-*.so +usr/lib/libTAO_DsLogAdmin-*.so +usr/lib/libTAO_DsLogAdmin_Skel-*.so +usr/lib/libTAO_DsLogAdmin_Serv-*.so +usr/lib/libTAO_DsNotifyLogAdmin-*.so +usr/lib/libTAO_DsNotifyLogAdmin_Skel-*.so +usr/lib/libTAO_DsNotifyLogAdmin_Serv-*.so +usr/lib/libTAO_FaultTolerance-*.so +usr/lib/libTAO_FT_ClientORB-*.so +usr/lib/libTAO_FT_ServerORB-*.so +usr/lib/libTAO_FTORB_Utils-*.so +usr/lib/libTAO_FTRT_EventChannel-*.so +usr/lib/libTAO_FtRtEvent-*.so +usr/lib/libTAO_FTRT_ClientORB-*.so +usr/lib/libTAO_HTIOP-*.so +usr/lib/libTAO_IFRService-*.so +usr/lib/libTAO_PortableGroup-*.so +usr/lib/libTAO_RTCORBAEvent-*.so +usr/lib/libTAO_RTEvent-*.so +usr/lib/libTAO_RTEvent_Serv-*.so +usr/lib/libTAO_RTEvent_Skel-*.so +usr/lib/libTAO_RTEventLogAdmin-*.so +usr/lib/libTAO_RTEventLogAdmin_Skel-*.so +usr/lib/libTAO_RTEventLogAdmin_Serv-*.so +usr/lib/libTAO_RTKokyuEvent-*.so +usr/lib/libTAO_RTSched-*.so +usr/lib/libTAO_RTSchedEvent-*.so +usr/lib/libTAO_RT_Notification-*.so +usr/lib/libTAO_SSLIOP-*.so +usr/lib/libTAO_Security-*.so +usr/lib/libTAO_Svc_Utils-*.so +usr/lib/libTAO_Notify_Service-*.so +usr/lib/libTAO_CosTime_Serv-*.so +usr/lib/libTAO_CosTime_Skel-*.so +usr/lib/libTAO_Catior_i-*.so +usr/lib/libTAO_ImR_Locator_IDL-*.so +usr/lib/libTAO_ImR_Activator-*.so +usr/lib/libTAO_Async_ImR_Client_IDL-*.so +usr/lib/libTAO_ReplicationManagerLib-*.so +usr/lib/libTAO_ImR_Activator_IDL-*.so +usr/lib/libTAO_ImR_Locator-*.so diff --git a/ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides b/ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides new file mode 100644 index 00000000000..8f357d027bf --- /dev/null +++ b/ACE/debian/libtao-orbsvcs-2.4.1.lintian-overrides @@ -0,0 +1,71 @@ +libtao-orbsvcs-2.2.7: package-name-doesnt-match-sonames libTAO-AV-2.2.7 libTAO-Async-ImR-Client-IDL-2.2.7 libTAO-Catior-i-2.2.7 libTAO-CosConcurrency-2.2.7 libTAO-CosConcurrency-Serv-2.2.7 libTAO-CosConcurrency-Skel-2.2.7 libTAO-CosEvent-2.2.7 libTAO-CosEvent-Serv-2.2.7 libTAO-CosEvent-Skel-2.2.7 libTAO-CosLifeCycle-2.2.7 libTAO-CosLifeCycle-Skel-2.2.7 libTAO-CosLoadBalancing-2.2.7 libTAO-CosNaming-2.2.7 libTAO-CosNaming-Serv-2.2.7 libTAO-CosNaming-Skel-2.2.7 libTAO-CosNotification-2.2.7 libTAO-CosNotification-MC-2.2.7 libTAO-CosNotification-MC-Ext-2.2.7 libTAO-CosNotification-Persist-2.2.7 libTAO-CosNotification-Serv-2.2.7 libTAO-CosNotification-Skel-2.2.7 libTAO-CosProperty-2.2.7 libTAO-CosProperty-Serv-2.2.7 libTAO-CosProperty-Skel-2.2.7 libTAO-CosTime-2.2.7 libTAO-CosTime-Serv-2.2.7 libTAO-CosTime-Skel-2.2.7 libTAO-CosTrading-2.2.7 libTAO-CosTrading-Serv-2.2.7 libTAO-CosTrading-Skel-2.2.7 libTAO-DsEventLogAdmin-2.2.7 libTAO-DsEventLogAdmin-Serv-2.2.7 libTAO-DsEventLogAdmin-Skel-2.2.7 libTAO-DsLogAdmin-2.2.7 libTAO-DsLogAdmin-Serv-2.2.7 libTAO-DsLogAdmin-Skel-2.2.7 libTAO-DsNotifyLogAdmin-2.2.7 libTAO-DsNotifyLogAdmin-Serv-2.2.7 libTAO-DsNotifyLogAdmin-Skel-2.2.7 libTAO-FTORB-Utils-2.2.7 libTAO-FTRT-ClientORB-2.2.7 libTAO-FTRT-EventChannel-2.2.7 libTAO-FT-ClientORB-2.2.7 libTAO-FT-ServerORB-2.2.7 libTAO-FaultTolerance-2.2.7 libTAO-FtRtEvent-2.2.7 libTAO-HTIOP-2.2.7 libTAO-IFRService-2.2.7 libTAO-ImR-Activator-2.2.7 libTAO-ImR-Activator-IDL-2.2.7 libTAO-ImR-Locator-2.2.7 libTAO-ImR-Locator-IDL-2.2.7 libTAO-Notify-Service-2.2.7 libTAO-PortableGroup-2.2.7 libTAO-RTCORBAEvent-2.2.7 libTAO-RTEvent-2.2.7 libTAO-RTEventLogAdmin-2.2.7 libTAO-RTEventLogAdmin-Serv-2.2.7 libTAO-RTEventLogAdmin-Skel-2.2.7 libTAO-RTEvent-Serv-2.2.7 libTAO-RTEvent-Skel-2.2.7 libTAO-RTKokyuEvent-2.2.7 libTAO-RTSched-2.2.7 libTAO-RTSchedEvent-2.2.7 libTAO-RT-Notification-2.2.7 libTAO-ReplicationManagerLib-2.2.7 libTAO-SSLIOP-2.2.7 libTAO-Security-2.2.7 libTAO-Svc-Utils-2.2.7 +libtao-orbsvcs-2.2.7: extended-description-is-probably-too-short +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLifeCycle_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FtRtEvent-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Locator-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ReplicationManagerLib-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLoadBalancing-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_AV-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTORB_Utils-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTSchedEvent-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Activator-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Activator_IDL-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTCORBAEvent-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Locator_IDL-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Notify_Service-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FT_ServerORB-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLifeCycle-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Persist-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Catior_i-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTRT_ClientORB-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Security-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_MC_Ext-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_HTIOP-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_IFRService-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Async_ImR_Client_IDL-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Svc_Utils-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent_Serv-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_PortableGroup-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RT_Notification-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FaultTolerance-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTKokyuEvent-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FT_ClientORB-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTRT_EventChannel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_SSLIOP-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency_Skel-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_MC-2.2.7.so +libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTSched-2.2.7.so diff --git a/ACE/debian/libtao-qtresource-2.4.0.install b/ACE/debian/libtao-qtresource-2.4.0.install deleted file mode 100644 index 172f4c45db8..00000000000 --- a/ACE/debian/libtao-qtresource-2.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libTAO_QtResource-*.so diff --git a/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides b/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides deleted file mode 100644 index d7c2f9dac9f..00000000000 --- a/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libtao-qtresource-2.2.7: no-symbols-control-file usr/lib/libTAO_QtResource-2.2.7.so diff --git a/ACE/debian/libtao-qtresource-2.4.1.install b/ACE/debian/libtao-qtresource-2.4.1.install new file mode 100644 index 00000000000..172f4c45db8 --- /dev/null +++ b/ACE/debian/libtao-qtresource-2.4.1.install @@ -0,0 +1 @@ +usr/lib/libTAO_QtResource-*.so diff --git a/ACE/debian/libtao-qtresource-2.4.1.lintian-overrides b/ACE/debian/libtao-qtresource-2.4.1.lintian-overrides new file mode 100644 index 00000000000..d7c2f9dac9f --- /dev/null +++ b/ACE/debian/libtao-qtresource-2.4.1.lintian-overrides @@ -0,0 +1 @@ +libtao-qtresource-2.2.7: no-symbols-control-file usr/lib/libTAO_QtResource-2.2.7.so diff --git a/ACE/debian/libtao-tkresource-2.4.0.install b/ACE/debian/libtao-tkresource-2.4.0.install deleted file mode 100644 index 7f543154b5b..00000000000 --- a/ACE/debian/libtao-tkresource-2.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libTAO_TkResource-*.so diff --git a/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides b/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides deleted file mode 100644 index 94627217c4e..00000000000 --- a/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libtao-tkresource-2.2.7: extended-description-is-probably-too-short -libtao-tkresource-2.2.7: no-symbols-control-file usr/lib/libTAO_TkResource-2.2.7.so diff --git a/ACE/debian/libtao-tkresource-2.4.1.install b/ACE/debian/libtao-tkresource-2.4.1.install new file mode 100644 index 00000000000..7f543154b5b --- /dev/null +++ b/ACE/debian/libtao-tkresource-2.4.1.install @@ -0,0 +1 @@ +usr/lib/libTAO_TkResource-*.so diff --git a/ACE/debian/libtao-tkresource-2.4.1.lintian-overrides b/ACE/debian/libtao-tkresource-2.4.1.lintian-overrides new file mode 100644 index 00000000000..94627217c4e --- /dev/null +++ b/ACE/debian/libtao-tkresource-2.4.1.lintian-overrides @@ -0,0 +1,2 @@ +libtao-tkresource-2.2.7: extended-description-is-probably-too-short +libtao-tkresource-2.2.7: no-symbols-control-file usr/lib/libTAO_TkResource-2.2.7.so diff --git a/ACE/debian/libtao-xtresource-2.4.0.install b/ACE/debian/libtao-xtresource-2.4.0.install deleted file mode 100644 index ab5151ed073..00000000000 --- a/ACE/debian/libtao-xtresource-2.4.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libTAO_XtResource-*.so diff --git a/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides b/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides deleted file mode 100644 index 3b0d1808c3c..00000000000 --- a/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libtao-xtresource-2.2.7: extended-description-is-probably-too-short -libtao-xtresource-2.2.7: no-symbols-control-file usr/lib/libTAO_XtResource-2.2.7.so diff --git a/ACE/debian/libtao-xtresource-2.4.1.install b/ACE/debian/libtao-xtresource-2.4.1.install new file mode 100644 index 00000000000..ab5151ed073 --- /dev/null +++ b/ACE/debian/libtao-xtresource-2.4.1.install @@ -0,0 +1 @@ +usr/lib/libTAO_XtResource-*.so diff --git a/ACE/debian/libtao-xtresource-2.4.1.lintian-overrides b/ACE/debian/libtao-xtresource-2.4.1.lintian-overrides new file mode 100644 index 00000000000..3b0d1808c3c --- /dev/null +++ b/ACE/debian/libtao-xtresource-2.4.1.lintian-overrides @@ -0,0 +1,2 @@ +libtao-xtresource-2.2.7: extended-description-is-probably-too-short +libtao-xtresource-2.2.7: no-symbols-control-file usr/lib/libTAO_XtResource-2.2.7.so diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 0d4c163cb9f..92d164fc9e0 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 6.4.0 -%define TAOVER 2.4.0 +%define ACEVER 6.4.1 +%define TAOVER 2.4.1 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-2_4_1 b/TAO/ChangeLogs/TAO-2_4_1 new file mode 100644 index 00000000000..4edd49eff78 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_4_1 @@ -0,0 +1,251 @@ +commit 999c2d14947c0e6f67061972cc8971789c5acbb4 +Author: Johnny Willemsen +Date: Tue Oct 4 12:07:48 2016 +0200 + + Extended list of user visible changes + * ACE/NEWS: + * TAO/NEWS: + +commit 668e749f2e66f540932c15078be44e14c5e43016 +Author: Adam Mitz +Date: Fri Sep 30 12:38:23 2016 -0500 + + Fixed parallel build error + +commit f1e42feed37f849562a1782f7f80a8ad371a3e46 +Author: Huang-Ming Huang +Date: Thu Sep 22 16:38:33 2016 -0500 + + Remove null reference checks + +commit 9ef7b1dd9a1ac4181df901f81bd134b53884181b +Author: Huang-Ming Huang +Date: Thu Sep 22 14:31:36 2016 -0500 + + Fix some fuzz errors + +commit 7a3126ae033cfab39c26ce38ad6112cf51e92f0d +Author: Huang-Ming Huang +Date: Thu Sep 22 12:19:56 2016 -0500 + + Fix issues with explicit template instantiation with versioned namespace + +commit eb42ae1e7cbce5863f79e4519befccb13e8f9018 +Author: Huang-Ming Huang +Date: Wed Sep 21 14:29:22 2016 -0500 + + Fixed all explicit singleton template instantiation + +commit d4e368c76124dc6dea13e33f92411aef17197fca +Author: Johnny Willemsen +Date: Thu Sep 15 16:20:00 2016 +0200 + + Mark the IFRService persistence test with !FIXED_BUGS_ONLY, it fails frequently which goes back to 2009, see bugzilla 3699 + * TAO/bin/tao_other_tests.lst: + +commit 5385cbc61f1ce880b06abd2960265297753f53cc +Author: Johnny Willemsen +Date: Thu Sep 15 16:00:48 2016 +0200 + + Cleanup + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h: + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: + +commit 87671627d5de5ed9c4a5dd06c4e1f7710ecba9eb +Author: Johnny Willemsen +Date: Thu Sep 15 16:00:08 2016 +0200 + + Removed not needed variable + * TAO/orbsvcs/IFR_Service/IFR_Service.h: + +commit cdf54724dea3807bfd5ed0773b11838048c2cf3a +Author: Johnny Willemsen +Date: Thu Sep 15 15:41:09 2016 +0200 + + Zapped some empty lines + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/README: + +commit 616babd5d1d50df61646b23bb6b4200f70dffe45 +Author: Johnny Willemsen +Date: Thu Sep 15 15:40:52 2016 +0200 + + Added shutdown to cleanly shutdown the ORB and release all CORBA resources to resolve several valgrind reported memory leaks + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h: + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp: + +commit 21737cc4d46d96e3b2c527b60277caf1bf4c3749 +Author: Johnny Willemsen +Date: Wed Sep 14 15:50:06 2016 +0200 + + Initialise member + * TAO/tao/Messaging/AMH_Response_Handler.cpp: + +commit 4be7a6680d28a33c81773e464e1c58c9d719e458 +Author: Johnny Willemsen +Date: Wed Sep 14 15:48:07 2016 +0200 + + Check the return value of get_component + * TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp: + +commit bbd816c5ddf6a8f44ccf6d5af520e134f578028b +Author: Johnny Willemsen +Date: Wed Sep 14 15:47:46 2016 +0200 + + Fixed coverity errors, initialize pointers + * TAO/tao/HTTP_Client.cpp: + * TAO/tao/HTTP_Handler.cpp: + +commit 5f217dc03ff7bb574f281056b2d526b50863d65b +Author: Johnny Willemsen +Date: Wed Sep 14 11:23:37 2016 +0200 + + Fixed memory leaks reported by Coverity + * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: + +commit ac6416f590563684d6ba660ddb89bd13c0842c70 +Author: Johnny Willemsen +Date: Wed Sep 14 11:02:02 2016 +0200 + + Use own_factory_ at the moment to cleanup to delete the factory at the moment we own it at destruction, fixes coverity errors + * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp: + +commit 5382791dbaa61a859cc4b8e6746b86c183d4f5b3 +Author: Johnny Willemsen +Date: Wed Sep 14 11:01:35 2016 +0200 + + Initialise value with 0 to fix Coverity error + * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp: + +commit f3387d02b2617c272300f22f2ae7a5864065997f +Author: Johnny Willemsen +Date: Sun Sep 4 19:20:58 2016 +0200 + + Fixed warning + * TAO/utils/logWalker/Invocation.cpp: + +commit 03ef5706e8b3dcdd8de7636f39aaca7543b23283 +Author: Johnny Willemsen +Date: Fri Sep 2 20:53:02 2016 +0200 + + Revert "*_SINGLETON_DECLARE needs to appear in .cpp files, not .h." + + This reverts commit 411929ec7d2550f289eb1a2f045f2fc6651cb002. + +commit 1004be5609bb7842835d865422c65332d08425ee +Author: Johnny Willemsen +Date: Fri Sep 2 20:52:39 2016 +0200 + + Revert "Updated previous change to TAO_AV_Core for versioned namespaces" + + This reverts commit 62cc01c2cc61f0da9618056e825274ec481a7686. + +commit 09cb0cc2e512ebcd3eba1a784dcf460568339d3f +Merge: d1463d5 c96749e +Author: Johnny Willemsen +Date: Fri Sep 2 19:45:00 2016 +0200 + + Merge branch 'master' of git://github.com/DOCGroup/ATCD + +commit d1463d5340978fac91d662c8518a40aee1430721 +Author: Johnny Willemsen +Date: Fri Sep 2 19:44:53 2016 +0200 + + Initialise pointer with 0 + * TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp: + +commit fe1f3dfb843c1480f0b9639efacf36be64bc0a4d +Author: Johnny Willemsen +Date: Fri Sep 2 19:44:41 2016 +0200 + + Documentation changes + * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h: + * TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h: + * TAO/orbsvcs/orbsvcs/Notify/Properties.h: + +commit c96749ebafa25b5660884e9071bf178837b53298 +Merge: 62cc01c 068b865 +Author: Johnny Willemsen +Date: Wed Aug 31 18:54:50 2016 +0200 + + Merge pull request #286 from jwillemsen/master + + Documentation changes + +commit 068b86554f9954b3270d6e263adbc817c6b733fa +Author: Johnny Willemsen +Date: Wed Aug 31 11:48:02 2016 +0200 + + Documentation changes + +commit 62cc01c2cc61f0da9618056e825274ec481a7686 +Author: Adam Mitz +Date: Wed Aug 24 17:17:26 2016 -0500 + + Updated previous change to TAO_AV_Core for versioned namespaces + +commit 411929ec7d2550f289eb1a2f045f2fc6651cb002 +Author: Adam Mitz +Date: Wed Aug 24 15:40:44 2016 -0500 + + *_SINGLETON_DECLARE needs to appear in .cpp files, not .h. + + This prevents multiple definition of typeinfo symbols during linking, + only seen on arm-linux-gnueabihf-g++ but the code is invalid C++ on + all platforms. + +commit 18cb08464abc1d506ae5c9d50c0428229f8653f6 +Author: Johnny Willemsen +Date: Wed Aug 10 13:40:32 2016 +0200 + + Fixed typo + * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h: + +commit ad958e7639275dc8626599ac0bfcc805a7e4ea76 +Author: Johnny Willemsen +Date: Wed Aug 10 13:28:52 2016 +0200 + + Fixed typos + * ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: + * ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: + * ACE/examples/QOS/Simple/QoS_Util.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h: + * TAO/orbsvcs/tests/AVStreams/Pluggable/server.h: + +commit 7664aa6b6c0f77ff5cdc01b16c1fe22c800dbd56 +Author: Johnny Willemsen +Date: Fri Aug 5 10:22:26 2016 +0200 + + Fixed typo and layout change + * TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp: + * TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp: + +commit b169ad5ff5c2fe5e0b92f96f871bd568e3e18bcf +Author: Johnny Willemsen +Date: Tue Aug 2 15:37:58 2016 +0200 + + Indent changes to fix gcc 6.1 warnings + * TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp: + +commit 602c0b17174fd84710f8730ad905a9014ec1e84b +Author: Adam Mitz +Date: Wed Jul 6 13:32:00 2016 -0500 + + Fix bugzilla #4215: workaround for a compiler bug in vc14-update3 + +commit da68e30dd6e6939b6aade74c46e25ca8594d7182 +Author: Johnny Willemsen +Date: Mon Jul 4 08:58:23 2016 +0200 + + Prepare for next release + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index 3dfcb5081b9..2170dc953ea 100644 --- a/TAO/PROBLEM-REPORT-FORM +++ b/TAO/PROBLEM-REPORT-FORM @@ -40,8 +40,8 @@ To: tao-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - TAO VERSION: 2.4.0 - ACE VERSION: 6.4.0 + TAO VERSION: 2.4.1 + ACE VERSION: 6.4.1 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/VERSION b/TAO/VERSION index 414d9712c3b..893cb03dfe7 100644 --- a/TAO/VERSION +++ b/TAO/VERSION @@ -1,4 +1,4 @@ -This is TAO version 2.4.0, released Mon Jul 04 08:47:38 CEST 2016 +This is TAO version 2.4.1, released Mon Oct 10 09:17:08 CEST 2016 If you have any problems with or questions about TAO, please send e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu), diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 5366141b2d1..9d4d089eb98 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,9 +4,9 @@ #define TAO_MAJOR_VERSION 2 #define TAO_MINOR_VERSION 4 -#define TAO_MICRO_VERSION 0 -#define TAO_BETA_VERSION 0 -#define TAO_VERSION "2.4.0" -#define TAO_VERSION_CODE 132096 +#define TAO_MICRO_VERSION 1 +#define TAO_BETA_VERSION 1 +#define TAO_VERSION "2.4.1" +#define TAO_VERSION_CODE 132097 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -- cgit v1.2.1 From 7d19d361f2aeffcb581d4bf2bf7e291435f40e70 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 10 Oct 2016 10:13:36 +0200 Subject: Make x.4.1 public and make initial changes for x.4.2 * ACE/NEWS: * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: * ACE/docs/Download.html: * ACE/docs/bczar/bczar.html: * ACE/etc/index.html: * TAO/NEWS: --- ACE/NEWS | 4 +- ACE/bin/diff-builds-and-group-fixed-tests-only.sh | 2 +- ACE/docs/Download.html | 62 +++++++++++------------ ACE/docs/bczar/bczar.html | 4 +- ACE/etc/index.html | 1 + TAO/NEWS | 3 ++ 6 files changed, 41 insertions(+), 35 deletions(-) diff --git a/ACE/NEWS b/ACE/NEWS index 75411ad3617..e3338ac417e 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,3 +1,6 @@ +USER VISIBLE CHANGES BETWEEN ACE-6.4.1 and ACE-6.4.2 +==================================================== + USER VISIBLE CHANGES BETWEEN ACE-6.4.0 and ACE-6.4.1 ==================================================== @@ -15,7 +18,6 @@ USER VISIBLE CHANGES BETWEEN ACE-6.4.0 and ACE-6.4.1 . Added support for Android NDK r12b (Platform API 24) and improved cross compilation support - USER VISIBLE CHANGES BETWEEN ACE-6.3.4 and ACE-6.4.0 ==================================================== diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index 6ba3e650b82..0c19c579925 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -2,7 +2,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2016_07_04; else olddate=$3; fi +if test -z $3; then olddate=2016_10_10; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index 4afb4abebd9..2209c53f379 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -103,79 +103,79 @@ of the ACE and TAO micro release kit is available for FilenameDescriptionFullSources only ACE+TAO.tar.gz ACE+TAO (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO.tar.bz2 ACE+TAO (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO.zip ACE+TAO (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE-html.tar.gz Doxygen documentation for ACE+TAO (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] ACE-html.tar.bz2 Doxygen documentation for ACE+TAO (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] ACE-html.zip Doxygen documentation for ACE+TAO (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] ACE.tar.gz ACE only (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE.tar.bz2 ACE only (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE.zip ACE only (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] -
  • Latest Release. The latest release is ACE 6.4.0 and TAO 2.4.0 +
  • Latest Minor Release. The latest minor release is ACE 6.4.0 and TAO 2.4.0 (ACE+TAO x.4.0), please use the links below to download it.

    diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index dcffca8ccc5..124acf116ad 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -273,7 +273,7 @@ Update the workspace with the right version tag (replace the X_Y_Z with the ACE version number being released e.g. 5_6_7)
    - git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_4_0 ACE_TAO
    + git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_4_1 ACE_TAO
  • Change to the ACE_TAO directory using
    cd ACE_TAO
    • @@ -304,7 +304,7 @@ rm -rf doxygen
    mkdir doxygen
    cd doxygen
    - git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_4_0 ACE_TAO
    + git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_4_1 ACE_TAO
    cd ACE_TAO
    export ACE_ROOT=$PWD/ACE
    export TAO_ROOT=$PWD/TAO
    diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 305eced38e2..392ff9f13af 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -30,6 +30,7 @@
    We do have the documentation for previous releases
      +

    • 6.4.1

    • 6.4.0

    • 6.3.4

    • 6.3.3

      • diff --git a/TAO/NEWS b/TAO/NEWS index 5d4c0d85667..9859b0ed85c 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,3 +1,6 @@ +USER VISIBLE CHANGES BETWEEN TAO-2.4.1 and TAO-2.4.2 +==================================================== + USER VISIBLE CHANGES BETWEEN TAO-2.4.0 and TAO-2.4.1 ==================================================== -- cgit v1.2.1 From 39650d84224ebb9e7a8af77af713de1ac1882323 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 11 Oct 2016 11:33:49 +0200 Subject: Removed signature and mailid, not used anymore * ACE/bin/make_release.py: * ACE/docs/bczar/bczar.html: --- ACE/bin/make_release.py | 21 ++------------------- ACE/docs/bczar/bczar.html | 2 -- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 2ed7c760211..963cc12cd33 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -28,13 +28,6 @@ args=None release""" doc_root=None -""" Full name of person performing release, obtained from the -environment""" -signature=None - -""" Full email address of person performing release. """ -mailid = None - """ A dict containing version information used for the release. This dict contains entries of the form COMPONENT_version @@ -130,23 +123,13 @@ def ex (command): def check_environment (): from os import getenv - global doc_root, signature, mailid, opts + global doc_root, opts doc_root = getenv ("DOC_ROOT") if (doc_root is None): print "ERROR: Environment DOC_ROOT must be defined." return False - signature = getenv ("SIGNATURE") - if (signature is None): - print "ERROR: Must define SIGNATURE environment variable to your full name, used in changelogs." - return False - - mailid = getenv ("MAILID") - if (mailid is None): - print "ERROR: Must define MAILID environment to your email address for changelogs." - return False - return True def vprint (string): @@ -670,7 +653,7 @@ def export_wc (stage_dir): print ("Retrieving MPC with tag " + tag) ex ("git clone --depth 1 --branch " + tag + " " + opts.mpc_root + " " + stage_dir + "/MPC") - # Settting up stage_dir + # Setting up stage_dir print ("Moving ACE") ex ("mv " + stage_dir + "/ACE_TAO/ACE " + stage_dir + "/ACE_wrappers") print ("Moving TAO") diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index 124acf116ad..c82c40e552d 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -225,8 +225,6 @@ mkdir DOC_ROOT
      cd DOC_ROOT
      export DOC_ROOT=$PWD
      - export SIGNATURE="Johnny Willemsen"
      - export MAILID=jwillemsen@remedy.nl
      git clone https://github.com/DOCGroup/ACE_TAO.git ACE_TAO
      git clone https://github.com/DOCGroup/MPC.git MPC
      cd ACE_TAO
      -- cgit v1.2.1 From 72fef8ab3dccc482ab69bbb04d983dc21bcea3d5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 11 Oct 2016 13:16:42 +0200 Subject: Talk about micro instead of a beta release * ACE/bin/make_release.py: * ACE/docs/bczar/bczar.html: --- ACE/bin/make_release.py | 60 +++++++++++++++++++++++------------------------ ACE/docs/bczar/bczar.html | 24 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 963cc12cd33..d4e6084a3e2 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -31,7 +31,7 @@ doc_root=None """ A dict containing version information used for the release. This dict contains entries of the form COMPONENT_version -COMPONENT_beta +COMPONENT_micro COMPONENT_minor COMPONENT_major COMPONENT_code """ @@ -60,8 +60,8 @@ def parse_args (): help="Create a major release.", default=None, const="major") parser.add_option ("--minor", dest="release_type", action="store_const", help="Create a minor release.", default=None, const="minor") - parser.add_option ("--beta", dest="release_type", action="store_const", - help="Create a beta release.", default=None, const="beta") + parser.add_option ("--micro", dest="release_type", action="store_const", + help="Create a micro release.", default=None, const="micro") parser.add_option ("--tag", dest="tag", action="store_true", help="Tag the repositorie with all needed tags", default=False) @@ -149,7 +149,7 @@ def commit (files): version = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"], comp_versions["ACE_minor"], - comp_versions["ACE_beta"]) + comp_versions["ACE_micro"]) vprint ("Committing the following files for " + version + " ".join (files)) if opts.take_action: @@ -226,8 +226,8 @@ def update_version_files (component): #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 + "_beta"], + component, comp_versions[component + "_micro"], + component, comp_versions[component + "_micro"], component, comp_versions[component + "_version"], component, comp_versions[component + "_code"], component) @@ -283,7 +283,7 @@ def update_spec_file (): if line.find ("define TAOVER ") is not -1: line = "%define TAOVER " + comp_versions["TAO_version"] + "\n" if line.find ("define is_major_ver") is not -1: - if opts.release_type == "beta": + if opts.release_type == "micro": line = "%define is_major_ver 0\n" else: line = "%define is_major_ver 1\n" @@ -436,7 +436,7 @@ def create_changelog (component): old_tag = "ACE+TAO-%d_%d_%d" % (old_comp_versions["ACE_major"], old_comp_versions["ACE_minor"], - old_comp_versions["ACE_beta"]) + old_comp_versions["ACE_micro"]) # Generate changelogs per component ex ("cd $DOC_ROOT/ACE_TAO && git log " + old_tag + "..HEAD " + component + " > " + component + "/ChangeLogs/" + component + "-" + comp_versions[component + "_version_"]) @@ -453,7 +453,7 @@ def get_comp_versions (component): global old_comp_versions, comp_versions, opts - beta = re.compile ("version (\d+)\.(\d+)\.(\d+)") + micro = re.compile ("version (\d+)\.(\d+)\.(\d+)") minor = re.compile ("version (\d+)\.(\d+)[^\.]") major = re.compile ("version (\d+)[^\.]") @@ -461,14 +461,14 @@ def get_comp_versions (component): for line in version_file: match = None - match = beta.search (line) + match = micro.search (line) if match is not None: - vprint ("Detected beta version %s.%s.%s" % + vprint ("Detected micro version %s.%s.%s" % (match.group (1), match.group (2), match.group (3))) comp_versions[component + "_major"] = int (match.group (1)) comp_versions[component + "_minor"] = int (match.group (2)) - comp_versions[component + "_beta"] = int (match.group (3)) + comp_versions[component + "_micro"] = int (match.group (3)) break match = minor.search (line) @@ -478,7 +478,7 @@ def get_comp_versions (component): comp_versions[component + "_major"] = int (match.group (1)) comp_versions[component + "_minor"] = int (match.group (2)) - comp_versions[component + "_beta"] = 0 + comp_versions[component + "_micro"] = 0 break match = major.search (line) @@ -487,7 +487,7 @@ def get_comp_versions (component): comp_versions[component + "_major"] = int (match.group (1)) comp_versions[component + "_minor"] = 0 - comp_versions[component + "_beta"] = 0 + comp_versions[component + "_micro"] = 0 break print "FATAL ERROR: Unable to locate current version for " + component @@ -496,42 +496,42 @@ def get_comp_versions (component): # Also store the current release (old from now) old_comp_versions[component + "_major"] = comp_versions[component + "_major"] old_comp_versions[component + "_minor"] = comp_versions[component + "_minor"] - old_comp_versions[component + "_beta"] = comp_versions[component + "_beta"] + old_comp_versions[component + "_micro"] = comp_versions[component + "_micro"] if opts.update: if opts.release_type == "major": comp_versions[component + "_major"] += 1 comp_versions[component + "_minor"] = 0 - comp_versions[component + "_beta"] = 0 + comp_versions[component + "_micro"] = 0 elif opts.release_type == "minor": comp_versions[component + "_minor"] += 1 - comp_versions[component + "_beta"] = 0 - elif opts.release_type == "beta": - comp_versions[component + "_beta"] += 1 + comp_versions[component + "_micro"] = 0 + elif opts.release_type == "micro": + comp_versions[component + "_micro"] += 1 - #if opts.release_type == "beta": + #if opts.release_type == "micro": comp_versions [component + "_version"] = \ str (comp_versions[component + "_major"]) + '.' + \ str (comp_versions[component + "_minor"]) + '.' + \ - str (comp_versions[component + "_beta"]) + str (comp_versions[component + "_micro"]) comp_versions [component + "_version_"] = \ str (comp_versions[component + "_major"]) + '_' + \ str (comp_versions[component + "_minor"]) + '_' + \ - str (comp_versions[component + "_beta"]) + str (comp_versions[component + "_micro"]) comp_versions [component + "_code"] = \ str((comp_versions[component + "_major"] << 16) + \ (comp_versions[component + "_minor"] << 8) + \ - comp_versions[component + "_beta"]) + comp_versions[component + "_micro"]) old_comp_versions [component + "_version"] = \ str (old_comp_versions[component + "_major"]) + '.' + \ str (old_comp_versions[component + "_minor"]) + '.' + \ - str (old_comp_versions[component + "_beta"]) + str (old_comp_versions[component + "_micro"]) old_comp_versions [component + "_version_"] = \ str (old_comp_versions[component + "_major"]) + '_' + \ str (old_comp_versions[component + "_minor"]) + '_' + \ - str (old_comp_versions[component + "_beta"]) + str (old_comp_versions[component + "_micro"]) if opts.update: vprint ("Updating from version %s to version %s" % @@ -577,7 +577,7 @@ def tag (): tagname = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"], comp_versions["ACE_minor"], - comp_versions["ACE_beta"]) + comp_versions["ACE_micro"]) if opts.tag: if opts.take_action: @@ -592,7 +592,7 @@ def tag (): update_latest_tag ("Major", tagname) elif opts.release_type == "minor": update_latest_tag ("Minor", tagname) - elif opts.release_type == "beta": + elif opts.release_type == "micro": update_latest_tag ("Beta", tagname) update_latest_tag ("Micro", tagname) else: @@ -607,7 +607,7 @@ def push (): tagname = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"], comp_versions["ACE_minor"], - comp_versions["ACE_beta"]) + comp_versions["ACE_micro"]) if opts.push: if opts.take_action: @@ -625,7 +625,7 @@ def push (): push_latest_tag ("Major", tagname) elif opts.release_type == "minor": push_latest_tag ("Minor", tagname) - elif opts.release_type == "beta": + elif opts.release_type == "micro": push_latest_tag ("Beta", tagname) push_latest_tag ("Micro", tagname) else: @@ -643,7 +643,7 @@ def export_wc (stage_dir): tag = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"], comp_versions["ACE_minor"], - comp_versions["ACE_beta"]) + comp_versions["ACE_micro"]) # Clone the ACE repository with the needed tag print ("Retrieving ACE with tag " + tag) diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index c82c40e552d..7323a6abf6c 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -41,7 +41,7 @@ Keep an eye on the bugzilla entries that are registered by users and developers. Decide on the bugs that - need to be fixed for the beta and pain developers for an ETA. + need to be fixed for the micro and pain developers for an ETA.

      The document here talks about the powers of a @@ -66,14 +66,14 @@ Do note that when there are a lot of compile errors the test results are really unusable.

      -

      Recipe for Cutting a Beta/Minor Kit

      +

      Recipe for Cutting a Minor Kit

      - The build czar is also in charge for the release of the beta. Cutting a beta is + The build czar is also in charge for the release of the micro. Cutting a micro is as simple as cutting butter if things go well. Here is the procedure followed - while cutting a beta: + while cutting a micro:

      1. - The whole process takes somewhere between 3-4 hours.
        2. + The whole process takes somewhere between 2-3 hours.
      2. We suggest you take advantage of GNU Screen so that even if your SSH session is interrupted, the cutting process can continue. This command must be installed on @@ -159,10 +159,10 @@
      3. Tag the release by executing
        - ACE/bin/make_release.py --beta --update --tag --push
        + ACE/bin/make_release.py --micro --update --tag --push
        This will only take a couple minutes to complete and once done successfully, you can carry on with BOTH creating the kits and generating the doxygen - documentation in parallel. NOTE that --beta should be replaced + documentation in parallel. NOTE that --micro should be replaced with --minor or --major as appropriate.

        4. After the repository has been tagged check each file listed below to make @@ -194,7 +194,7 @@ from DOC_ROOT will suffice.
        The tag will also need to be removed (both in Middleware and MPC): ACE+TAO-X_Y_Z (where X is the ACE Major version number, and Y & Z are the - Minor and Beta release numbers of the release that is to be restarted).

        + Minor and Micro release numbers of the release that is to be restarted).

        E.g.:
        cd ACE_TAO && git tag -d ACE+TAO-X_Y_Z
        cd MPC && git tag -d ACE+TAO-X_Y_Z
        @@ -228,9 +228,9 @@ git clone https://github.com/DOCGroup/ACE_TAO.git ACE_TAO
        git clone https://github.com/DOCGroup/MPC.git MPC
        cd ACE_TAO
        - ACE/bin/make_release.py --beta --update --verbose
        - ACE/bin/make_release.py --beta --tag --verbose
        - ACE/bin/make_release.py --beta --push --verbose
        + ACE/bin/make_release.py --micro --update --verbose
        + ACE/bin/make_release.py --micro --tag --verbose
        + ACE/bin/make_release.py --micro --push --verbose
        ACE/bin/make_release.py --kit

        @@ -467,7 +467,7 @@ DEVO group about it.

      4. Send a note to sysadmin@isis.vanderbilt.edu asking for the repo to be frozen. Provide them a list of names, including yourself and bczar to be granted write permission.
        5. -
      5. Compile once on Win32, Linux and Solaris before cutting a beta.
        6. +
      6. Compile once on Win32, Linux and Solaris before cutting a micro.
      7. Trust the release script when making a release. Don't make tar balls by hand.
      8. When all hell breaks loose, don't wait for the nightly builds to monitor -- cgit v1.2.1 From 9fd4bf36d3527c91cc79fc4e9dcfa087c5588b3f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 17 Oct 2016 12:04:48 +0200 Subject: Changed indentation of generated array code to reduce its size * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp: --- TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index 4f0c08aeeaa..9b4ecf44ffe 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -182,8 +182,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "void" << be_nl << "TAO::Array_Traits<" << fname << "_forany>::free (" << be_idt << be_idt_nl - << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl + << fname << "_slice * _tao_slice)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << fname << "_free (_tao_slice);" << be_uidt_nl << "}"; @@ -193,8 +192,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << fname << "_slice *" << be_nl << "TAO::Array_Traits<" << fname << "_forany>::dup (" << be_idt << be_idt_nl - << "const " << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl + << "const " << fname << "_slice * _tao_slice)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "return " << fname << "_dup (_tao_slice);" << be_uidt_nl << "}"; @@ -205,8 +203,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "TAO::Array_Traits<" << fname << "_forany>::copy (" << be_idt << be_idt_nl << fname << "_slice * _tao_to," << be_nl - << "const " << fname << "_slice * _tao_from" << be_uidt_nl - << ")" << be_uidt_nl + << "const " << fname << "_slice * _tao_from)" << be_uidt << be_uidt_nl << "{" << be_idt_nl << fname << "_copy (_tao_to, _tao_from);" << be_uidt_nl << "}"; @@ -216,8 +213,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << "void" << be_nl << "TAO::Array_Traits<" << fname << "_forany>::zero (" << be_idt << be_idt_nl - << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl + << fname << "_slice * _tao_slice)" << be_uidt << be_uidt_nl << "{" << be_idt_nl; ACE_CDR::ULong ndims = node->n_dims (); -- cgit v1.2.1 From 956f2f051339a94b536c2495068cba0d71b15727 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 17 Oct 2016 12:32:13 +0200 Subject: TAO Array specializations should appear between core versioning macros * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp: --- TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index 9b4ecf44ffe..11d7cccbaac 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -177,6 +177,9 @@ int be_visitor_array_ci::visit_array (be_array *node) unique += "_traits"; + *os << be_nl + << be_global->core_versioning_begin (); + *os << be_nl_2 << "ACE_INLINE" << be_nl << "void" << be_nl @@ -346,6 +349,9 @@ int be_visitor_array_ci::visit_array (be_array *node) *os << be_nl; + *os << be_nl + << be_global->core_versioning_end (); + node->cli_inline_gen (true); return 0; } -- cgit v1.2.1