diff options
| -rw-r--r-- | ACE/ace/config-macosx-mojave.h | 6 | ||||
| -rw-r--r-- | ACE/ace/config-macosx.h | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_mojave.GNU | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 8 | ||||
| -rw-r--r-- | TAO/examples/PluggableUDP/tests/Performance/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_3845_Regression/issue570.idl | 4 | ||||
| -rwxr-xr-x | TAO/tests/Bug_3845_Regression/run_test.pl | 11 |
9 files changed, 38 insertions, 6 deletions
diff --git a/ACE/ace/config-macosx-mojave.h b/ACE/ace/config-macosx-mojave.h new file mode 100644 index 00000000000..6b0164b9e33 --- /dev/null +++ b/ACE/ace/config-macosx-mojave.h @@ -0,0 +1,6 @@ +#ifndef ACE_CONFIG_MACOSX_MOJAVE_H +#define ACE_CONFIG_MACOSX_MOJAVE_H + +#include "ace/config-macosx-highsierra.h" + +#endif // ACE_CONFIG_MACOSX_MOJAVE_H diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 3c63301d8a5..13a853a9318 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -2,7 +2,9 @@ #define ACE_CONFIG_MACOSX_ALL_H #include <Availability.h> -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 +#include "config-macosx-mojave.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 #include "config-macosx-highsierra.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 #include "config-macosx-sierra.h" diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 4636074a7bc..f318adace60 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -19,12 +19,13 @@ MACOS_CODENAME_VER_10_10 := yosemite MACOS_CODENAME_VER_10_11 := elcapitan MACOS_CODENAME_VER_10_12 := sierra MACOS_CODENAME_VER_10_13 := highsierra -MACOS_CODENAME_VER_latest := highsierra +MACOS_CODENAME_VER_10_14 := mojave +MACOS_CODENAME_VER_latest := mojave MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) ifeq ($(MACOS_MAJOR_VERSION),10) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 13; echo $$?),0) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; echo $$?),0) ## if the detected version is greater than the latest know version, ## just use the latest known version MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) diff --git a/ACE/include/makeinclude/platform_macosx_mojave.GNU b/ACE/include/makeinclude/platform_macosx_mojave.GNU new file mode 100644 index 00000000000..908d2971bfd --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_mojave.GNU @@ -0,0 +1,2 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_highsierra.GNU + diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 6a909093d90..f8b25ec0f32 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -1215,8 +1215,14 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, const bool global_scope_name = work->is_global_name (name); if (global_scope_name) { + // No tail, exit directly + UTL_List* tail = e->tail (); + if (!tail) + { + return 0; + } // Remove the preceeding "::" or "" from the scopename - e = static_cast<UTL_ScopedName *> (e->tail ()); + e = static_cast<UTL_ScopedName *> (tail); name = e->head (); // Move directly to the root scope diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 59fdd903710..91741c7b2b2 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -163,7 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); root_poa->destroy (1, // ethernalize objects - 0) // wait for completion + 0); // wait for completion orb->destroy (); diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 66b11a2c88d..54cc2944398 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -17,7 +17,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ContainedSeq_var interfaces = repo_->contents (CORBA::dk_Interface, // Any type of contained object. - 1) // Exclude parents of interfaces. + 1); // Exclude parents of interfaces. CORBA::ULong length = interfaces->length (); diff --git a/TAO/tests/Bug_3845_Regression/issue570.idl b/TAO/tests/Bug_3845_Regression/issue570.idl new file mode 100644 index 00000000000..c688ed48102 --- /dev/null +++ b/TAO/tests/Bug_3845_Regression/issue570.idl @@ -0,0 +1,4 @@ +// Reproducer IDL for issue 570 +// https://github.com/DOCGroup/ACE_TAO/issues/570 + +struct X { _; }; diff --git a/TAO/tests/Bug_3845_Regression/run_test.pl b/TAO/tests/Bug_3845_Regression/run_test.pl index bc7adaddbbc..d02a4a7e147 100755 --- a/TAO/tests/Bug_3845_Regression/run_test.pl +++ b/TAO/tests/Bug_3845_Regression/run_test.pl @@ -28,6 +28,7 @@ $input_file1 = $server->LocalFile ("local_inarg.idl"); $input_file2 = $server->LocalFile ("local_inoutarg.idl"); $input_file3 = $server->LocalFile ("local_outarg.idl"); $input_file4 = $server->LocalFile ("local_rettype.idl"); +$input_file5 = $server->LocalFile ("issue570.idl"); # Compile the IDL $SV = $server->CreateProcess ("$tao_idl", "$input_file1"); @@ -49,6 +50,11 @@ $SV = $server->CreateProcess ("$tao_idl", "$input_file4"); $server_status4 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); +# Compile the IDL +$SV = $server->CreateProcess ("$tao_idl", "$input_file5"); + +$server_status5 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + open (STDOUT, ">&OLDOUT"); open (STDERR, ">&OLDERR"); @@ -72,4 +78,9 @@ if ($server_status4 == 0) { $status = 1; } +if ($server_status5 == 0) { + print STDERR "ERROR: tao_idl returned $server_status5 for $input_file5, should have failed\n"; + $status = 1; +} + exit $status; |