diff options
| author | msmit <msmit@remedy.nl> | 2009-02-18 09:24:23 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-02-18 09:24:23 +0000 |
| commit | b9b5b15e3082a1810dde58292b67f6112f91a79d (patch) | |
| tree | d1a3b91d4d5b7ffefc023d2bb3d59766aae2f420 /ACE/tests | |
| parent | 0439a3bd939349a4df377a4a3e27f6b6e3414b7c (diff) | |
| download | ATCD-b9b5b15e3082a1810dde58292b67f6112f91a79d.tar.gz | |
Wed Feb 18 09:22:29 UTC 2009 Marcel Smit <msmit@remedy.nl>
* DLL_Test.h:
Revert changes made by Johnny (just use
ace/svc_export.h again).
* DLL_Test_Export.h:
Removed since ace/svc_export.h is
used again.
Diffstat (limited to 'ACE/tests')
| -rw-r--r-- | ACE/tests/DLL_Test.h | 4 | ||||
| -rw-r--r-- | ACE/tests/DLL_Test_Export.h | 58 |
2 files changed, 2 insertions, 60 deletions
diff --git a/ACE/tests/DLL_Test.h b/ACE/tests/DLL_Test.h index ead5c550280..fb55875eff9 100644 --- a/ACE/tests/DLL_Test.h +++ b/ACE/tests/DLL_Test.h @@ -22,7 +22,7 @@ #include "ace/Log_Msg.h" #include "ace/Trace.h" -#include "DLL_Test_Export.h" +#include "ace/svc_export.h" /** * @class Hello @@ -61,7 +61,7 @@ public: // Used to test dynamic_cast<> in shared libraries. -class DLL_Test_Export Child : public Parent +class ACE_Svc_Export Child : public Parent { public: diff --git a/ACE/tests/DLL_Test_Export.h b/ACE/tests/DLL_Test_Export.h deleted file mode 100644 index 48cdb44c6f0..00000000000 --- a/ACE/tests/DLL_Test_Export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s DLL_Test_Export -// ------------------------------ -#ifndef DLL_TEST_EXPORT_H -#define DLL_TEST_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DLL_TEST_HAS_DLL) -# define DLL_TEST_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DLL_TEST_HAS_DLL */ - -#if !defined (DLL_TEST_HAS_DLL) -# define DLL_TEST_HAS_DLL 1 -#endif /* ! DLL_TEST_HAS_DLL */ - -#if defined (DLL_TEST_HAS_DLL) && (DLL_TEST_HAS_DLL == 1) -# if defined (DLL_TEST_BUILD_DLL) -# define DLL_Test_Export ACE_Proper_Export_Flag -# define DLL_TEST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DLL_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DLL_TEST_BUILD_DLL */ -# define DLL_Test_Export ACE_Proper_Import_Flag -# define DLL_TEST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DLL_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DLL_TEST_BUILD_DLL */ -#else /* DLL_TEST_HAS_DLL == 1 */ -# define DLL_Test_Export -# define DLL_TEST_SINGLETON_DECLARATION(T) -# define DLL_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DLL_TEST_HAS_DLL == 1 */ - -// Set DLL_TEST_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DLL_TEST_NTRACE) -# if (ACE_NTRACE == 1) -# define DLL_TEST_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DLL_TEST_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DLL_TEST_NTRACE */ - -#if (DLL_TEST_NTRACE == 1) -# define DLL_TEST_TRACE(X) -#else /* (DLL_TEST_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DLL_TEST_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DLL_TEST_NTRACE == 1) */ - -#endif /* DLL_TEST_EXPORT_H */ - -// End of auto generated file. |