diff options
13 files changed, 27 insertions, 588 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 33e9c43dc43..4ab6a58838d 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,23 @@ +Tue Sep 22 21:22:48 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * performance-tests/Protocols/Sender/Sender_svnt_export.h: + * performance-tests/Protocols/Sender/Sender_stub_export.h: + * performance-tests/Protocols/Sender/Sender_exec_export.h: + * performance-tests/Protocols/Receiver/Receiver_exec_export.h: + * performance-tests/Protocols/Receiver/Receiver_svnt_export.h: + * performance-tests/Protocols/Receiver/Receiver_stub_export.h: + * performance-tests/Protocols/common/Protocols_stub_export.h: + * performance-tests/Protocols/common/Protocols_skel_export.h: + + Removed these files, now generated. + + * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: + * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: + * performance-tests/Protocols/Receiver/Receiver.mpc: + * performance-tests/Protocols/common/Protocols.mpc: + + Addition of -Glfa IDL compiler option where necessary. + Tue Sep 22 21:00:03 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * examples/Hello/Hello_Base/Hello_Base_stub_export.h: diff --git a/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc index bc3a83705f4..0efa7ee7880 100644 --- a/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc +++ b/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc @@ -3,7 +3,8 @@ project(Benchmark_RoundTrip_idl_gen) : componentidldefaults { custom_only = 1 - idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export \ + idlflags += -Glfa \ + -Wb,stub_export_macro=ROUNDTRIP_STUB_Export \ -Wb,stub_export_include=RoundTrip_stub_export.h \ -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export \ -Wb,skel_export_include=RoundTrip_svnt_export.h \ diff --git a/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc index ffe2c6e5b9c..cd3f1a41f94 100644 --- a/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc +++ b/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc @@ -3,7 +3,8 @@ project(Benchmark_RoundTripClient_idl_gen) : componentidldefaults { custom_only = 1 - idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export \ + idlflags += -Glfa \ + -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export \ -Wb,stub_export_include=RoundTripClient_stub_export.h \ -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export \ -Wb,skel_export_include=RoundTripClient_svnt_export.h \ diff --git a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc index 4e62d32fe57..7ae30fdf942 100644 --- a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc +++ b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc @@ -3,7 +3,8 @@ project(Protocols_Receiver_idl_gen) : componentidldefaults { custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + idlflags += -Glfa \ + -Wb,stub_export_macro=RECEIVER_STUB_Export \ -Wb,stub_export_include=Receiver_stub_export.h \ -Wb,skel_export_macro=RECEIVER_SVNT_Export \ -Wb,skel_export_include=Receiver_svnt_export.h \ diff --git a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_exec_export.h b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_exec_export.h deleted file mode 100644 index c7cdf25fdd7..00000000000 --- a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_exec_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef RECEIVER_EXEC_EXPORT_H -#define RECEIVER_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_EXEC_HAS_DLL) -# define RECEIVER_EXEC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && RECEIVER_EXEC_HAS_DLL */ - -#if !defined (RECEIVER_EXEC_HAS_DLL) -# define RECEIVER_EXEC_HAS_DLL 1 -#endif /* ! RECEIVER_EXEC_HAS_DLL */ - -#if defined (RECEIVER_EXEC_HAS_DLL) && (RECEIVER_EXEC_HAS_DLL == 1) -# if defined (RECEIVER_EXEC_BUILD_DLL) -# define RECEIVER_EXEC_Export ACE_Proper_Export_Flag -# define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* RECEIVER_EXEC_BUILD_DLL */ -# define RECEIVER_EXEC_Export ACE_Proper_Import_Flag -# define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* RECEIVER_EXEC_BUILD_DLL */ -#else /* RECEIVER_EXEC_HAS_DLL == 1 */ -# define RECEIVER_EXEC_Export -# define RECEIVER_EXEC_SINGLETON_DECLARATION(T) -# define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* RECEIVER_EXEC_HAS_DLL == 1 */ - -// Set RECEIVER_EXEC_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (RECEIVER_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define RECEIVER_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define RECEIVER_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !RECEIVER_EXEC_NTRACE */ - -#if (RECEIVER_EXEC_NTRACE == 1) -# define RECEIVER_EXEC_TRACE(X) -#else /* (RECEIVER_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define RECEIVER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (RECEIVER_EXEC_NTRACE == 1) */ - -#endif /* RECEIVER_EXEC_EXPORT_H */ - diff --git a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_stub_export.h b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_stub_export.h deleted file mode 100644 index f594652b837..00000000000 --- a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_stub_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef RECEIVER_STUB_EXPORT_H -#define RECEIVER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_STUB_HAS_DLL) -# define RECEIVER_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && RECEIVER_STUB_HAS_DLL */ - -#if !defined (RECEIVER_STUB_HAS_DLL) -# define RECEIVER_STUB_HAS_DLL 1 -#endif /* ! RECEIVER_STUB_HAS_DLL */ - -#if defined (RECEIVER_STUB_HAS_DLL) && (RECEIVER_STUB_HAS_DLL == 1) -# if defined (RECEIVER_STUB_BUILD_DLL) -# define RECEIVER_STUB_Export ACE_Proper_Export_Flag -# define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* RECEIVER_STUB_BUILD_DLL */ -# define RECEIVER_STUB_Export ACE_Proper_Import_Flag -# define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* RECEIVER_STUB_BUILD_DLL */ -#else /* RECEIVER_STUB_HAS_DLL == 1 */ -# define RECEIVER_STUB_Export -# define RECEIVER_STUB_SINGLETON_DECLARATION(T) -# define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* RECEIVER_STUB_HAS_DLL == 1 */ - -// Set RECEIVER_STUB_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (RECEIVER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define RECEIVER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define RECEIVER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !RECEIVER_STUB_NTRACE */ - -#if (RECEIVER_STUB_NTRACE == 1) -# define RECEIVER_STUB_TRACE(X) -#else /* (RECEIVER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define RECEIVER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (RECEIVER_STUB_NTRACE == 1) */ - -#endif /* RECEIVER_STUB_EXPORT_H */ - diff --git a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_svnt_export.h b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_svnt_export.h deleted file mode 100644 index 13f27eadf99..00000000000 --- a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver_svnt_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef RECEIVER_SVNT_EXPORT_H -#define RECEIVER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_SVNT_HAS_DLL) -# define RECEIVER_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && RECEIVER_SVNT_HAS_DLL */ - -#if !defined (RECEIVER_SVNT_HAS_DLL) -# define RECEIVER_SVNT_HAS_DLL 1 -#endif /* ! RECEIVER_SVNT_HAS_DLL */ - -#if defined (RECEIVER_SVNT_HAS_DLL) && (RECEIVER_SVNT_HAS_DLL == 1) -# if defined (RECEIVER_SVNT_BUILD_DLL) -# define RECEIVER_SVNT_Export ACE_Proper_Export_Flag -# define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* RECEIVER_SVNT_BUILD_DLL */ -# define RECEIVER_SVNT_Export ACE_Proper_Import_Flag -# define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* RECEIVER_SVNT_BUILD_DLL */ -#else /* RECEIVER_SVNT_HAS_DLL == 1 */ -# define RECEIVER_SVNT_Export -# define RECEIVER_SVNT_SINGLETON_DECLARATION(T) -# define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* RECEIVER_SVNT_HAS_DLL == 1 */ - -// Set RECEIVER_SVNT_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (RECEIVER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define RECEIVER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define RECEIVER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !RECEIVER_SVNT_NTRACE */ - -#if (RECEIVER_SVNT_NTRACE == 1) -# define RECEIVER_SVNT_TRACE(X) -#else /* (RECEIVER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define RECEIVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (RECEIVER_SVNT_NTRACE == 1) */ - -#endif /* RECEIVER_SVNT_EXPORT_H */ - diff --git a/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec_export.h b/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec_export.h deleted file mode 100644 index 1b4314897c0..00000000000 --- a/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef SENDER_EXEC_EXPORT_H -#define SENDER_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_EXEC_HAS_DLL) -# define SENDER_EXEC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && SENDER_EXEC_HAS_DLL */ - -#if !defined (SENDER_EXEC_HAS_DLL) -# define SENDER_EXEC_HAS_DLL 1 -#endif /* ! SENDER_EXEC_HAS_DLL */ - -#if defined (SENDER_EXEC_HAS_DLL) && (SENDER_EXEC_HAS_DLL == 1) -# if defined (SENDER_EXEC_BUILD_DLL) -# define SENDER_EXEC_Export ACE_Proper_Export_Flag -# define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* SENDER_EXEC_BUILD_DLL */ -# define SENDER_EXEC_Export ACE_Proper_Import_Flag -# define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* SENDER_EXEC_BUILD_DLL */ -#else /* SENDER_EXEC_HAS_DLL == 1 */ -# define SENDER_EXEC_Export -# define SENDER_EXEC_SINGLETON_DECLARATION(T) -# define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* SENDER_EXEC_HAS_DLL == 1 */ - -// Set SENDER_EXEC_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (SENDER_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define SENDER_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define SENDER_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !SENDER_EXEC_NTRACE */ - -#if (SENDER_EXEC_NTRACE == 1) -# define SENDER_EXEC_TRACE(X) -#else /* (SENDER_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define SENDER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (SENDER_EXEC_NTRACE == 1) */ - -#endif /* SENDER_EXEC_EXPORT_H */ - diff --git a/modules/CIAO/performance-tests/Protocols/Sender/Sender_stub_export.h b/modules/CIAO/performance-tests/Protocols/Sender/Sender_stub_export.h deleted file mode 100644 index 92f9df9e572..00000000000 --- a/modules/CIAO/performance-tests/Protocols/Sender/Sender_stub_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef SENDER_STUB_EXPORT_H -#define SENDER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_STUB_HAS_DLL) -# define SENDER_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && SENDER_STUB_HAS_DLL */ - -#if !defined (SENDER_STUB_HAS_DLL) -# define SENDER_STUB_HAS_DLL 1 -#endif /* ! SENDER_STUB_HAS_DLL */ - -#if defined (SENDER_STUB_HAS_DLL) && (SENDER_STUB_HAS_DLL == 1) -# if defined (SENDER_STUB_BUILD_DLL) -# define SENDER_STUB_Export ACE_Proper_Export_Flag -# define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* SENDER_STUB_BUILD_DLL */ -# define SENDER_STUB_Export ACE_Proper_Import_Flag -# define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* SENDER_STUB_BUILD_DLL */ -#else /* SENDER_STUB_HAS_DLL == 1 */ -# define SENDER_STUB_Export -# define SENDER_STUB_SINGLETON_DECLARATION(T) -# define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* SENDER_STUB_HAS_DLL == 1 */ - -// Set SENDER_STUB_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (SENDER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define SENDER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define SENDER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !SENDER_STUB_NTRACE */ - -#if (SENDER_STUB_NTRACE == 1) -# define SENDER_STUB_TRACE(X) -#else /* (SENDER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define SENDER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (SENDER_STUB_NTRACE == 1) */ - -#endif /* SENDER_STUB_EXPORT_H */ - diff --git a/modules/CIAO/performance-tests/Protocols/Sender/Sender_svnt_export.h b/modules/CIAO/performance-tests/Protocols/Sender/Sender_svnt_export.h deleted file mode 100644 index 67dad4dce1b..00000000000 --- a/modules/CIAO/performance-tests/Protocols/Sender/Sender_svnt_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef SENDER_SVNT_EXPORT_H -#define SENDER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_SVNT_HAS_DLL) -# define SENDER_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && SENDER_SVNT_HAS_DLL */ - -#if !defined (SENDER_SVNT_HAS_DLL) -# define SENDER_SVNT_HAS_DLL 1 -#endif /* ! SENDER_SVNT_HAS_DLL */ - -#if defined (SENDER_SVNT_HAS_DLL) && (SENDER_SVNT_HAS_DLL == 1) -# if defined (SENDER_SVNT_BUILD_DLL) -# define SENDER_SVNT_Export ACE_Proper_Export_Flag -# define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* SENDER_SVNT_BUILD_DLL */ -# define SENDER_SVNT_Export ACE_Proper_Import_Flag -# define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* SENDER_SVNT_BUILD_DLL */ -#else /* SENDER_SVNT_HAS_DLL == 1 */ -# define SENDER_SVNT_Export -# define SENDER_SVNT_SINGLETON_DECLARATION(T) -# define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* SENDER_SVNT_HAS_DLL == 1 */ - -// Set SENDER_SVNT_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (SENDER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define SENDER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define SENDER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !SENDER_SVNT_NTRACE */ - -#if (SENDER_SVNT_NTRACE == 1) -# define SENDER_SVNT_TRACE(X) -#else /* (SENDER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define SENDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (SENDER_SVNT_NTRACE == 1) */ - -#endif /* SENDER_SVNT_EXPORT_H */ - diff --git a/modules/CIAO/performance-tests/Protocols/common/Protocols.mpc b/modules/CIAO/performance-tests/Protocols/common/Protocols.mpc index 9b0a3f2d6a9..6caf598e6be 100644 --- a/modules/CIAO/performance-tests/Protocols/common/Protocols.mpc +++ b/modules/CIAO/performance-tests/Protocols/common/Protocols.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Protocols" -project(Protocols_idl_gen) : ciaoidldefaults, anytypecode { +project(Protocols_idl_gen) : componentidldefaults, anytypecode { custom_only = 1 idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export \ -Wb,stub_export_include=Protocols_stub_export.h \ diff --git a/modules/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h b/modules/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h deleted file mode 100644 index 2f169679d78..00000000000 --- a/modules/CIAO/performance-tests/Protocols/common/Protocols_skel_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 PROTOCOLS_SKEL -// ------------------------------ -#ifndef PROTOCOLS_SKEL_EXPORT_H -#define PROTOCOLS_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (PROTOCOLS_SKEL_HAS_DLL) -# define PROTOCOLS_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && PROTOCOLS_SKEL_HAS_DLL */ - -#if !defined (PROTOCOLS_SKEL_HAS_DLL) -# define PROTOCOLS_SKEL_HAS_DLL 1 -#endif /* ! PROTOCOLS_SKEL_HAS_DLL */ - -#if defined (PROTOCOLS_SKEL_HAS_DLL) && (PROTOCOLS_SKEL_HAS_DLL == 1) -# if defined (PROTOCOLS_SKEL_BUILD_DLL) -# define PROTOCOLS_SKEL_Export ACE_Proper_Export_Flag -# define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* PROTOCOLS_SKEL_BUILD_DLL */ -# define PROTOCOLS_SKEL_Export ACE_Proper_Import_Flag -# define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* PROTOCOLS_SKEL_BUILD_DLL */ -#else /* PROTOCOLS_SKEL_HAS_DLL == 1 */ -# define PROTOCOLS_SKEL_Export -# define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) -# define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* PROTOCOLS_SKEL_HAS_DLL == 1 */ - -// Set PROTOCOLS_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PROTOCOLS_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define PROTOCOLS_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PROTOCOLS_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PROTOCOLS_SKEL_NTRACE */ - -#if (PROTOCOLS_SKEL_NTRACE == 1) -# define PROTOCOLS_SKEL_TRACE(X) -#else /* (PROTOCOLS_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PROTOCOLS_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PROTOCOLS_SKEL_NTRACE == 1) */ - -#endif /* PROTOCOLS_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/modules/CIAO/performance-tests/Protocols/common/Protocols_stub_export.h b/modules/CIAO/performance-tests/Protocols/common/Protocols_stub_export.h deleted file mode 100644 index a214c4ceda9..00000000000 --- a/modules/CIAO/performance-tests/Protocols/common/Protocols_stub_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 PROTOCOLS_STUB -// ------------------------------ -#ifndef PROTOCOLS_STUB_EXPORT_H -#define PROTOCOLS_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (PROTOCOLS_STUB_HAS_DLL) -# define PROTOCOLS_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && PROTOCOLS_STUB_HAS_DLL */ - -#if !defined (PROTOCOLS_STUB_HAS_DLL) -# define PROTOCOLS_STUB_HAS_DLL 1 -#endif /* ! PROTOCOLS_STUB_HAS_DLL */ - -#if defined (PROTOCOLS_STUB_HAS_DLL) && (PROTOCOLS_STUB_HAS_DLL == 1) -# if defined (PROTOCOLS_STUB_BUILD_DLL) -# define PROTOCOLS_STUB_Export ACE_Proper_Export_Flag -# define PROTOCOLS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define PROTOCOLS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* PROTOCOLS_STUB_BUILD_DLL */ -# define PROTOCOLS_STUB_Export ACE_Proper_Import_Flag -# define PROTOCOLS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define PROTOCOLS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* PROTOCOLS_STUB_BUILD_DLL */ -#else /* PROTOCOLS_STUB_HAS_DLL == 1 */ -# define PROTOCOLS_STUB_Export -# define PROTOCOLS_STUB_SINGLETON_DECLARATION(T) -# define PROTOCOLS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* PROTOCOLS_STUB_HAS_DLL == 1 */ - -// Set PROTOCOLS_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PROTOCOLS_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define PROTOCOLS_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PROTOCOLS_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PROTOCOLS_STUB_NTRACE */ - -#if (PROTOCOLS_STUB_NTRACE == 1) -# define PROTOCOLS_STUB_TRACE(X) -#else /* (PROTOCOLS_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PROTOCOLS_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PROTOCOLS_STUB_NTRACE == 1) */ - -#endif /* PROTOCOLS_STUB_EXPORT_H */ - -// End of auto generated file. |