diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-11-22 12:47:17 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-11-22 12:47:17 +0000 |
| commit | 2a636090ee065de50659869a887c25647fbfa9fc (patch) | |
| tree | 9410f9802fef1cd9fe5436cd07e885772a7e5053 | |
| parent | 297f644e5401b1269bd68fe335b6e2fddced3d28 (diff) | |
| download | ATCD-2a636090ee065de50659869a887c25647fbfa9fc.tar.gz | |
Tue Nov 22 12:46:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
* tests/Bug_3531b_Regression/server.cpp:
Fix ST build errors.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tests/Bug_3531b_Regression/server.cpp | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 45486fb9b76..e8208576796 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 22 12:46:00 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3531b_Regression/server.cpp: + + Fix ST build errors. + Mon Nov 21 11:59:40 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/Upcall_Wrapper.h: diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 6c0b5cd7598..153e1cfec84 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -13,6 +13,8 @@ #include "tao/TAO_Export.h" #include "ace/TP_Reactor.h" +#if defined (ACE_HAS_THREADS) + int nthreads = 4; bool debug = false; @@ -1102,4 +1104,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; } +#else + +int +ACE_TMAIN(int /*argc*/, ACE_TCHAR * /*argv*/ []) +{ + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This test only makes sense in an MT build.\n"))); + + return 0; +} + +#endif // !ACE_HAS_THREADS + // **************************************************************** |