From 8d8ebcb4bd271cd11de4d817ee25ff46fdab5acf Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Tue, 12 Apr 2011 11:45:31 +0000 Subject: Tue Apr 12 11:44:20 UTC 2011 William R. Otte * tests/LocalityManager/CircularDependency/Circular_Dependency_export.h: * tests/LocalityManager/CircularDependency/Handler_A.h: * tests/LocalityManager/CircularDependency/Handler_B.h: Renamed the export file to avoid a spurious fuzz error. * tests/LocalityManager/CircularDependency/CircularDependency_export.h: Removed this file. --- DAnCE/ChangeLog | 12 +++++ .../CircularDependency/CircularDependency_export.h | 58 ---------------------- .../Circular_Dependency_export.h | 58 ++++++++++++++++++++++ .../LocalityManager/CircularDependency/Handler_A.h | 2 +- .../LocalityManager/CircularDependency/Handler_B.h | 2 +- 5 files changed, 72 insertions(+), 60 deletions(-) delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/CircularDependency_export.h create mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 1070db8381e..e4b6c5e59bd 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,15 @@ +Tue Apr 12 11:44:20 UTC 2011 William R. Otte + + * tests/LocalityManager/CircularDependency/Circular_Dependency_export.h: + * tests/LocalityManager/CircularDependency/Handler_A.h: + * tests/LocalityManager/CircularDependency/Handler_B.h: + + Renamed the export file to avoid a spurious fuzz error. + + * tests/LocalityManager/CircularDependency/CircularDependency_export.h: + + Removed this file. + Tue Apr 12 01:16:47 UTC 2011 William R. Otte * tests/LocalityManager/CircularDependency/Handler_A.cpp: diff --git a/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency_export.h b/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency_export.h deleted file mode 100644 index 11225244cad..00000000000 --- a/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency_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 CircularDependency -// ------------------------------ -#ifndef CIRCULARDEPENDENCY_EXPORT_H -#define CIRCULARDEPENDENCY_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIRCULARDEPENDENCY_HAS_DLL) -# define CIRCULARDEPENDENCY_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIRCULARDEPENDENCY_HAS_DLL */ - -#if !defined (CIRCULARDEPENDENCY_HAS_DLL) -# define CIRCULARDEPENDENCY_HAS_DLL 1 -#endif /* ! CIRCULARDEPENDENCY_HAS_DLL */ - -#if defined (CIRCULARDEPENDENCY_HAS_DLL) && (CIRCULARDEPENDENCY_HAS_DLL == 1) -# if defined (CIRCULARDEPENDENCY_BUILD_DLL) -# define CircularDependency_Export ACE_Proper_Export_Flag -# define CIRCULARDEPENDENCY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIRCULARDEPENDENCY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIRCULARDEPENDENCY_BUILD_DLL */ -# define CircularDependency_Export ACE_Proper_Import_Flag -# define CIRCULARDEPENDENCY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIRCULARDEPENDENCY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIRCULARDEPENDENCY_BUILD_DLL */ -#else /* CIRCULARDEPENDENCY_HAS_DLL == 1 */ -# define CircularDependency_Export -# define CIRCULARDEPENDENCY_SINGLETON_DECLARATION(T) -# define CIRCULARDEPENDENCY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIRCULARDEPENDENCY_HAS_DLL == 1 */ - -// Set CIRCULARDEPENDENCY_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIRCULARDEPENDENCY_NTRACE) -# if (ACE_NTRACE == 1) -# define CIRCULARDEPENDENCY_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIRCULARDEPENDENCY_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIRCULARDEPENDENCY_NTRACE */ - -#if (CIRCULARDEPENDENCY_NTRACE == 1) -# define CIRCULARDEPENDENCY_TRACE(X) -#else /* (CIRCULARDEPENDENCY_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIRCULARDEPENDENCY_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIRCULARDEPENDENCY_NTRACE == 1) */ - -#endif /* CIRCULARDEPENDENCY_EXPORT_H */ - -// End of auto generated file. diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h b/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h new file mode 100644 index 00000000000..11225244cad --- /dev/null +++ b/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl CircularDependency +// ------------------------------ +#ifndef CIRCULARDEPENDENCY_EXPORT_H +#define CIRCULARDEPENDENCY_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (CIRCULARDEPENDENCY_HAS_DLL) +# define CIRCULARDEPENDENCY_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && CIRCULARDEPENDENCY_HAS_DLL */ + +#if !defined (CIRCULARDEPENDENCY_HAS_DLL) +# define CIRCULARDEPENDENCY_HAS_DLL 1 +#endif /* ! CIRCULARDEPENDENCY_HAS_DLL */ + +#if defined (CIRCULARDEPENDENCY_HAS_DLL) && (CIRCULARDEPENDENCY_HAS_DLL == 1) +# if defined (CIRCULARDEPENDENCY_BUILD_DLL) +# define CircularDependency_Export ACE_Proper_Export_Flag +# define CIRCULARDEPENDENCY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define CIRCULARDEPENDENCY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* CIRCULARDEPENDENCY_BUILD_DLL */ +# define CircularDependency_Export ACE_Proper_Import_Flag +# define CIRCULARDEPENDENCY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define CIRCULARDEPENDENCY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* CIRCULARDEPENDENCY_BUILD_DLL */ +#else /* CIRCULARDEPENDENCY_HAS_DLL == 1 */ +# define CircularDependency_Export +# define CIRCULARDEPENDENCY_SINGLETON_DECLARATION(T) +# define CIRCULARDEPENDENCY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* CIRCULARDEPENDENCY_HAS_DLL == 1 */ + +// Set CIRCULARDEPENDENCY_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (CIRCULARDEPENDENCY_NTRACE) +# if (ACE_NTRACE == 1) +# define CIRCULARDEPENDENCY_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define CIRCULARDEPENDENCY_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !CIRCULARDEPENDENCY_NTRACE */ + +#if (CIRCULARDEPENDENCY_NTRACE == 1) +# define CIRCULARDEPENDENCY_TRACE(X) +#else /* (CIRCULARDEPENDENCY_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define CIRCULARDEPENDENCY_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (CIRCULARDEPENDENCY_NTRACE == 1) */ + +#endif /* CIRCULARDEPENDENCY_EXPORT_H */ + +// End of auto generated file. diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h b/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h index f7378402fdd..bf3e9a49e0f 100644 --- a/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h +++ b/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h @@ -18,7 +18,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CircularDependency_export.h" +#include "Circular_Dependency_export.h" #include "tao/LocalObject.h" namespace DAnCE diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h b/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h index 259952fa87d..0b3907f16d2 100644 --- a/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h +++ b/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h @@ -18,7 +18,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CircularDependency_export.h" +#include "Circular_Dependency_export.h" #include "tao/LocalObject.h" namespace DAnCE -- cgit v1.2.1