diff options
author | bala <balanatarajan@users.noreply.github.com> | 2003-06-02 05:45:38 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2003-06-02 05:45:38 +0000 |
commit | 658be848220d226aae35207bb8928890cbd1017f (patch) | |
tree | 0cdb09879dafaaa159c2460d5b578de6b4dbb3f2 | |
parent | 0e9d7c1ab11103c5cb54dad10c8d534263d98098 (diff) | |
download | ATCD-658be848220d226aae35207bb8928890cbd1017f.tar.gz |
ChangeLogTag:Mon Jun 2 00:25:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 16 | ||||
-rw-r--r-- | TAO/tests/IDL_Test/Makefile | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a02ae594562..680446b5c40 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,6 +1,20 @@ +Mon Jun 2 00:25:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tests/IDL_Test/Makefile: Disable the test if + templates=explicit. The test is sufficiently complicated (for + very good reasons) to get it right with explicit template + instantiations. It is easy to fix the problem by changing the + way the IDL's are specified. But we dont want to loose the + structure of the exisiting IDL files in our test directories. + + Once we have a nice way to handle these cases with explicit + templates we can revert this. We will open up a bugzilla entry + to remind us. The IDL compiler needs to get smarterwith users + cooperation to handle all this weird cases. + Sun Jun 1 23:38:40 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * Makefile: Added paths to the CONTROLLE_FILES.w + * Makefile: Added paths to the CONTROLLE_FILES Sun Jun 01 19:34:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile index d06109ba746..8775b5b6204 100644 --- a/TAO/tests/IDL_Test/Makefile +++ b/TAO/tests/IDL_Test/Makefile @@ -72,6 +72,7 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(templates),implicit) BUILD += namespace_check.cpp \ reopened_modulesC.cpp \ reopen_include1C.cpp \ @@ -80,6 +81,8 @@ BUILD += namespace_check.cpp \ nested_scopeC.cpp BIN = main +endif #templates == implicit + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU |