diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-08-12 16:59:36 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-08-12 16:59:36 +0000 |
| commit | 0a06166ce38a21d6aff99c881bb64a8062949204 (patch) | |
| tree | 02295e1247973d364a2bebcd5cb1c58ed539458d | |
| parent | 80926808ad32b04e68d56dc5e02d76b2344caddb (diff) | |
| download | ATCD-0a06166ce38a21d6aff99c881bb64a8062949204.tar.gz | |
ChangeLogTag:Thu Aug 12 11:35:44 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp | 17 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb | 2 |
4 files changed, 29 insertions, 17 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index b47257929a6..3ac65160dab 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,20 @@ +Thu Aug 12 11:35:44 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * DAnCE/ciao/Servant_Impl_T.cpp: + * DAnCE/ciao/Servant_Impl_T.h: + + Propogating the changes from "Mon Aug 9 11:38:04 2004 Jeff + Parsons <j.parsons@vanderbilt.edu>" to DAnCE. + + * DAnCE/tests/Config_Handlers/Handler_Test.cpp: + * DAnCE/tests/Config_Handlers/Handler_Test.h: + + Cleaned up things so that it is more portable. + + * DAnCE/tests/Config_Handlers/handler_test.mpb: + + Put Handler_Test as a template file. + Thu Aug 12 16:20:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/tests/Config_Handlers/Handler_Test.cpp: diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp index 79b523297e9..6b117839019 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp @@ -1,4 +1,6 @@ // $Id$ +#ifndef HANDLER_TEST_CPP +#define HANDLER_TEST_CPP #include "Handler_Test.h" @@ -65,7 +67,7 @@ int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)) } if (url == 0) { - usage(argv[0]); + usage (argv[0]); return -1; } @@ -199,15 +201,4 @@ int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)) } -#ifdef ACE_HAS_BROKEN_NESTED_TEMPLATES - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("DaNCe internal testing doesn't work with compilers ") - ACE_TEXT ("not supporting nested templates (like VC6).\n"))); - return -1; -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES +#endif /*HANDLER_TEST_CPP*/ diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h index f0acbd1fe77..b51a6e4c00b 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h @@ -6,8 +6,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_main.h" -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "tao/Exception.h" @@ -43,6 +41,12 @@ template <typename HANDLER, typename DATA> int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)); -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "Handler_Test.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation ("Handler_Test.cpp") +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif // HANDLER_TEST_H diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb index fae3de02b21..250a6b65224 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb @@ -9,7 +9,7 @@ project : taoexe, ciao_client_dnc, ciao_deployment_stub { // , portableserver libs += xerces-c Config_Handlers // Deployment_stub Deployment_svnt after += Config_Handlers - Source_Files { + Template_Files { Handler_Test.cpp } } |