summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2011-08-04 15:53:34 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2011-08-04 15:53:34 +0000
commitccfaa0c82145dc4acf156ba08dfdc900b9342502 (patch)
treeaa90e1cf678052d5ac8080802dd0deb9865e8526 /TAO/tests
parent2d9b97dc67c90b80d2c5e5d747da708800d9702f (diff)
downloadATCD-ccfaa0c82145dc4acf156ba08dfdc900b9342502.tar.gz
Thu Aug 4 15:47:33 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* TAO-INSTALL.html: Added note about building for Android. * tests/Sequence_Unit_Tests/string_sequence_tester.hpp: Additional compiler macro added to build on Android. Thanks to Trevor Fields of OCI for doing the heavy lifting for porting TAO to Android.
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
index 6ebcf3d7018..cfe469708a5 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
@@ -62,7 +62,7 @@ struct string_sequence_test_helpers<char>
}
};
-#if defined(_GLIBCPP_VERSION) && !defined(_GLIBCPP_USE_WCHAR_T)
+#if defined(_GLIBCPP_VERSION) && !defined(_GLIBCPP_USE_WCHAR_T) && !defined(TAO_LACKS_WCHAR_CXX_STDLIB)
# define TAO_LACKS_WCHAR_CXX_STDLIB
#endif