diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-10-01 20:16:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 20:16:34 +0200 |
| commit | b1d7ab6144de23a331a3c2ff1a25eee658022f5d (patch) | |
| tree | 37fe4aa909f33de87d6272810da29485804c5a3c | |
| parent | 6dbb27d53a7f2ed1f4f726db1f467d9f3149643e (diff) | |
| parent | 0c03edc0a82959b51724d49e9ec2676609d5de9a (diff) | |
| download | ATCD-b1d7ab6144de23a331a3c2ff1a25eee658022f5d.tar.gz | |
Merge pull request #305 from mitza-oci/master
Fixed parallel build error
| -rw-r--r-- | ACE/NEWS | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc | 4 |
2 files changed, 18 insertions, 0 deletions
@@ -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 ==================================================== 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 + } } |