summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-10-22 22:01:51 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-10-22 22:01:51 +0000
commitea78cfad54b7459dd7498a7895b75a65c989c95c (patch)
treed9d443fc7adf79fcad8e933a6c4acb9fad43731b
parenta8bb112f012100e88da4d7d4769cabef6e0eb4d2 (diff)
downloadATCD-ea78cfad54b7459dd7498a7895b75a65c989c95c.tar.gz
Sat Oct 22 22:01:01 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h: * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h: Export macros.
-rw-r--r--DAnCE/ChangeLog7
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h57
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h3
3 files changed, 66 insertions, 1 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 32ad1288413..a91e7fe1f78 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 22 22:01:01 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h:
+ * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
+
+ Export macros.
+
Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h
new file mode 100644
index 00000000000..2c451c09f95
--- /dev/null
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h
@@ -0,0 +1,57 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// ------------------------------
+#ifndef CORBA_DOMAIN_VALIDATOR_EXPORT_H
+#define CORBA_DOMAIN_VALIDATOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (CORBA_DOMAIN_VALIDATOR_HAS_DLL)
+# define CORBA_DOMAIN_VALIDATOR_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && CORBA_DOMAIN_VALIDATOR_HAS_DLL */
+
+#if !defined (CORBA_DOMAIN_VALIDATOR_HAS_DLL)
+# define CORBA_DOMAIN_VALIDATOR_HAS_DLL 1
+#endif /* ! CORBA_DOMAIN_VALIDATOR_HAS_DLL */
+
+#if defined (CORBA_DOMAIN_VALIDATOR_HAS_DLL) && (CORBA_DOMAIN_VALIDATOR_HAS_DLL == 1)
+# if defined (CORBA_DOMAIN_VALIDATOR_BUILD_DLL)
+# define CORBA_Domain_Validator_Export ACE_Proper_Export_Flag
+# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* CORBA_DOMAIN_VALIDATOR_BUILD_DLL */
+# define CORBA_Domain_Validator_Export ACE_Proper_Import_Flag
+# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* CORBA_DOMAIN_VALIDATOR_BUILD_DLL */
+#else /* CORBA_DOMAIN_VALIDATOR_HAS_DLL == 1 */
+# define CORBA_Domain_Validator_Export
+# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARATION(T)
+# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* CORBA_DOMAIN_VALIDATOR_HAS_DLL == 1 */
+
+// Set CORBA_DOMAIN_VALIDATOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (CORBA_DOMAIN_VALIDATOR_NTRACE)
+# if (ACE_NTRACE == 1)
+# define CORBA_DOMAIN_VALIDATOR_NTRACE 1
+# else /* (ACE_NTRACE == 1) */
+# define CORBA_DOMAIN_VALIDATOR_NTRACE 0
+# endif /* (ACE_NTRACE == 1) */
+#endif /* !CORBA_DOMAIN_VALIDATOR_NTRACE */
+
+#if (CORBA_DOMAIN_VALIDATOR_NTRACE == 1)
+# define CORBA_DOMAIN_VALIDATOR_TRACE(X)
+#else /* (CORBA_DOMAIN_VALIDATOR_NTRACE == 1) */
+# if !defined (ACE_HAS_TRACE)
+# define ACE_HAS_TRACE
+# endif /* ACE_HAS_TRACE */
+# define CORBA_DOMAIN_VALIDATOR_TRACE(X) ACE_TRACE_IMPL(X)
+# include "ace/Trace.h"
+#endif /* (CORBA_DOMAIN_VALIDATOR_NTRACE == 1) */
+
+#endif /* CORBA_DOMAIN_VALIDATOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h
index 76ec8c95021..fdc039983cf 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h
@@ -12,6 +12,7 @@
#define DOMAIN_VALIDATORI_TI3IMY_H_
#include "tools/Domain_Validator/Domain_ValidatorS.h"
+#include "tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
@@ -22,7 +23,7 @@
#include <map>
#include <list>
-class DAnCE_Domain_Validator_Stub_Export DAnCE_Domain_Validator_i
+class CORBA_Domain_Validator_Export DAnCE_Domain_Validator_i
: public virtual DAnCE::Domain_Validator,
public virtual ::CORBA::LocalObject
{