diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-24 09:32:16 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-24 09:32:16 +0000 |
| commit | 258c86708d39d35cbddf13bfb496f7311265122b (patch) | |
| tree | 380c133b4add7d407bb3c8c12ad0ffc0dfc9f29a | |
| parent | c78713a2a775188c51cad272d99e5991bad7f205 (diff) | |
| download | ATCD-258c86708d39d35cbddf13bfb496f7311265122b.tar.gz | |
Tue Nov 24 09:30:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_2130_Regression/interfaces/ENW.mpc
* tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
* tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
* tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
* tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
* tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
* tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
* tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
* tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
* tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
* tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
* tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
* tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
* tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
* tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
* tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
* tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
* tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
* tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
* tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
* tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
* tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
* tests/IDL3/Events/Abstract/Abstract.mpc
* tests/IDL3/Events/Abstract/Abstract_stub_export.h
* tests/IDL3/Events/Abstract/Abstract_svnt_export.h
* tests/IDL3/Events/Regular/Regular.mpc
* tests/IDL3/Events/Regular/Regular_stub_export.h
* tests/IDL3/Events/Regular/Regular_svnt_export.h
* tests/IDL3/Homes/Attributes/HomeAttributes.mpc
* tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h
* tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h
* tests/IDL3/Homes/Basic/Basic.mpc
* tests/IDL3/Homes/Basic/Basic_stub_export.h
* tests/IDL3/Homes/Basic/Basic_svnt_export.h
* tests/IDL3/Homes/Factory/Factory.mpc
* tests/IDL3/Homes/Factory/Factory_stub_export.h
* tests/IDL3/Homes/Factory/Factory_svnt_export.h
* tests/IDL3/Homes/Finder/Finder.mpc
* tests/IDL3/Homes/Finder/Finder_stub_export.h
* tests/IDL3/Homes/Finder/Finder_svnt_export.h
* tests/IDL3/Homes/Inheritance/Inheritance.mpc
* tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h
* tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h
* tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
* tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h
* tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h
* tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
* tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h
* tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h
* tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
* tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h
* tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h
* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h
* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h
* tests/IDL3/ImpliedIDL/Events/Events.mpc
* tests/IDL3/ImpliedIDL/Events/Events_stub_export.h
* tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h
* tests/IDL3/ImpliedIDL/Homes/Homes.mpc
* tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h
* tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h
* tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
* tests/Minimum/Minimum_Base/Minimum_Base.mpc
* tests/Minimum/Minimum_Base/Minimum_Base_skel_export.h
* tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h
Let the IDL compiler generate all export files
* tests/IDL_Test/Local_Facet
* tests/IDL_Test/Local_Facet/Local_Facet.idl
* tests/IDL_Test/Local_Facet/Local_Facet.mpc
* tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp
* tests/IDL_Test/Local_Facet/Local_Facet_exec.h
New test to show that local facets don't work, disabled by default
70 files changed, 482 insertions, 2518 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 1340335a634..b841aa01311 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,79 @@ +Tue Nov 24 09:30:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_2130_Regression/interfaces/ENW.mpc + * tests/Bug_2130_Regression/interfaces/ENW_skel_export.h + * tests/Bug_2130_Regression/interfaces/ENW_stub_export.h + * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc + * tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h + * tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h + * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc + * tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h + * tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h + * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc + * tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h + * tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h + * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc + * tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h + * tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h + * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc + * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h + * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h + * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc + * tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h + * tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h + * tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h + * tests/IDL3/Events/Abstract/Abstract.mpc + * tests/IDL3/Events/Abstract/Abstract_stub_export.h + * tests/IDL3/Events/Abstract/Abstract_svnt_export.h + * tests/IDL3/Events/Regular/Regular.mpc + * tests/IDL3/Events/Regular/Regular_stub_export.h + * tests/IDL3/Events/Regular/Regular_svnt_export.h + * tests/IDL3/Homes/Attributes/HomeAttributes.mpc + * tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h + * tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h + * tests/IDL3/Homes/Basic/Basic.mpc + * tests/IDL3/Homes/Basic/Basic_stub_export.h + * tests/IDL3/Homes/Basic/Basic_svnt_export.h + * tests/IDL3/Homes/Factory/Factory.mpc + * tests/IDL3/Homes/Factory/Factory_stub_export.h + * tests/IDL3/Homes/Factory/Factory_svnt_export.h + * tests/IDL3/Homes/Finder/Finder.mpc + * tests/IDL3/Homes/Finder/Finder_stub_export.h + * tests/IDL3/Homes/Finder/Finder_svnt_export.h + * tests/IDL3/Homes/Inheritance/Inheritance.mpc + * tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h + * tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h + * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc + * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h + * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h + * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc + * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h + * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h + * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc + * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h + * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h + * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc + * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h + * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h + * tests/IDL3/ImpliedIDL/Events/Events.mpc + * tests/IDL3/ImpliedIDL/Events/Events_stub_export.h + * tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h + * tests/IDL3/ImpliedIDL/Homes/Homes.mpc + * tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h + * tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h + * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc + * tests/Minimum/Minimum_Base/Minimum_Base.mpc + * tests/Minimum/Minimum_Base/Minimum_Base_skel_export.h + * tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h + Let the IDL compiler generate all export files + + * tests/IDL_Test/Local_Facet + * tests/IDL_Test/Local_Facet/Local_Facet.idl + * tests/IDL_Test/Local_Facet/Local_Facet.mpc + * tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp + * tests/IDL_Test/Local_Facet/Local_Facet_exec.h + New test to show that local facets don't work, disabled by default + Mon Nov 23 15:19:00 UTC 2009 Marcel Smit <msmit@remedy.nl> * bin/ciao_tests.lst: diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc index 940fc921321..d6881188b2c 100644 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc +++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc @@ -6,7 +6,7 @@ project(ENW_stub): ccm_stub, event { idlflags += -Wb,stub_export_macro=ENW_STUB_Export \ -Wb,stub_export_include=ENW_stub_export.h \ -Wb,skel_export_macro=ENW_SKEL_Export \ - -Wb,skel_export_include=ENW_skel_export.h + -Wb,skel_export_include=ENW_skel_export.h -Gxhst -Gxhsk dynamicflags = ENW_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h deleted file mode 100644 index eb90568f309..00000000000 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_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 ENW_SKEL -// ------------------------------ -#ifndef ENW_SKEL_EXPORT_H -#define ENW_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ENW_SKEL_HAS_DLL) -# define ENW_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ENW_SKEL_HAS_DLL */ - -#if !defined (ENW_SKEL_HAS_DLL) -# define ENW_SKEL_HAS_DLL 1 -#endif /* ! ENW_SKEL_HAS_DLL */ - -#if defined (ENW_SKEL_HAS_DLL) && (ENW_SKEL_HAS_DLL == 1) -# if defined (ENW_SKEL_BUILD_DLL) -# define ENW_SKEL_Export ACE_Proper_Export_Flag -# define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ENW_SKEL_BUILD_DLL */ -# define ENW_SKEL_Export ACE_Proper_Import_Flag -# define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ENW_SKEL_BUILD_DLL */ -#else /* ENW_SKEL_HAS_DLL == 1 */ -# define ENW_SKEL_Export -# define ENW_SKEL_SINGLETON_DECLARATION(T) -# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ENW_SKEL_HAS_DLL == 1 */ - -// Set ENW_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ENW_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define ENW_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ENW_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ENW_SKEL_NTRACE */ - -#if (ENW_SKEL_NTRACE == 1) -# define ENW_SKEL_TRACE(X) -#else /* (ENW_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ENW_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ENW_SKEL_NTRACE == 1) */ - -#endif /* ENW_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h deleted file mode 100644 index dd8f95cc1f5..00000000000 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_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 ENW_STUB -// ------------------------------ -#ifndef ENW_STUB_EXPORT_H -#define ENW_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ENW_STUB_HAS_DLL) -# define ENW_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ENW_STUB_HAS_DLL */ - -#if !defined (ENW_STUB_HAS_DLL) -# define ENW_STUB_HAS_DLL 1 -#endif /* ! ENW_STUB_HAS_DLL */ - -#if defined (ENW_STUB_HAS_DLL) && (ENW_STUB_HAS_DLL == 1) -# if defined (ENW_STUB_BUILD_DLL) -# define ENW_STUB_Export ACE_Proper_Export_Flag -# define ENW_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ENW_STUB_BUILD_DLL */ -# define ENW_STUB_Export ACE_Proper_Import_Flag -# define ENW_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ENW_STUB_BUILD_DLL */ -#else /* ENW_STUB_HAS_DLL == 1 */ -# define ENW_STUB_Export -# define ENW_STUB_SINGLETON_DECLARATION(T) -# define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ENW_STUB_HAS_DLL == 1 */ - -// Set ENW_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ENW_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ENW_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ENW_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ENW_STUB_NTRACE */ - -#if (ENW_STUB_NTRACE == 1) -# define ENW_STUB_TRACE(X) -#else /* (ENW_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ENW_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ENW_STUB_NTRACE == 1) */ - -#endif /* ENW_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc index eea659666a3..b5fc7bb9ee4 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc +++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc @@ -4,7 +4,7 @@ project(Attributes_stub): ccm_stub { sharedname = Attributes_stub - idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h + idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h -Gxhst -Gxhsk dynamicflags = ATTRIBUTES_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h deleted file mode 100644 index dfa59c5b267..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_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 ATTRIBUTES_STUB -// ------------------------------ -#ifndef ATTRIBUTES_STUB_EXPORT_H -#define ATTRIBUTES_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ATTRIBUTES_STUB_HAS_DLL) -# define ATTRIBUTES_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ATTRIBUTES_STUB_HAS_DLL */ - -#if !defined (ATTRIBUTES_STUB_HAS_DLL) -# define ATTRIBUTES_STUB_HAS_DLL 1 -#endif /* ! ATTRIBUTES_STUB_HAS_DLL */ - -#if defined (ATTRIBUTES_STUB_HAS_DLL) && (ATTRIBUTES_STUB_HAS_DLL == 1) -# if defined (ATTRIBUTES_STUB_BUILD_DLL) -# define ATTRIBUTES_STUB_Export ACE_Proper_Export_Flag -# define ATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ATTRIBUTES_STUB_BUILD_DLL */ -# define ATTRIBUTES_STUB_Export ACE_Proper_Import_Flag -# define ATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ATTRIBUTES_STUB_BUILD_DLL */ -#else /* ATTRIBUTES_STUB_HAS_DLL == 1 */ -# define ATTRIBUTES_STUB_Export -# define ATTRIBUTES_STUB_SINGLETON_DECLARATION(T) -# define ATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ATTRIBUTES_STUB_HAS_DLL == 1 */ - -// Set ATTRIBUTES_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ATTRIBUTES_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ATTRIBUTES_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ATTRIBUTES_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ATTRIBUTES_STUB_NTRACE */ - -#if (ATTRIBUTES_STUB_NTRACE == 1) -# define ATTRIBUTES_STUB_TRACE(X) -#else /* (ATTRIBUTES_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ATTRIBUTES_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ATTRIBUTES_STUB_NTRACE == 1) */ - -#endif /* ATTRIBUTES_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h deleted file mode 100644 index e641264d206..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_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 ATTRIBUTES_SVNT -// ------------------------------ -#ifndef ATTRIBUTES_SVNT_EXPORT_H -#define ATTRIBUTES_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ATTRIBUTES_SVNT_HAS_DLL) -# define ATTRIBUTES_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ATTRIBUTES_SVNT_HAS_DLL */ - -#if !defined (ATTRIBUTES_SVNT_HAS_DLL) -# define ATTRIBUTES_SVNT_HAS_DLL 1 -#endif /* ! ATTRIBUTES_SVNT_HAS_DLL */ - -#if defined (ATTRIBUTES_SVNT_HAS_DLL) && (ATTRIBUTES_SVNT_HAS_DLL == 1) -# if defined (ATTRIBUTES_SVNT_BUILD_DLL) -# define ATTRIBUTES_SVNT_Export ACE_Proper_Export_Flag -# define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ATTRIBUTES_SVNT_BUILD_DLL */ -# define ATTRIBUTES_SVNT_Export ACE_Proper_Import_Flag -# define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ATTRIBUTES_SVNT_BUILD_DLL */ -#else /* ATTRIBUTES_SVNT_HAS_DLL == 1 */ -# define ATTRIBUTES_SVNT_Export -# define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) -# define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ATTRIBUTES_SVNT_HAS_DLL == 1 */ - -// Set ATTRIBUTES_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ATTRIBUTES_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ATTRIBUTES_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ATTRIBUTES_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ATTRIBUTES_SVNT_NTRACE */ - -#if (ATTRIBUTES_SVNT_NTRACE == 1) -# define ATTRIBUTES_SVNT_TRACE(X) -#else /* (ATTRIBUTES_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ATTRIBUTES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ATTRIBUTES_SVNT_NTRACE == 1) */ - -#endif /* ATTRIBUTES_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc index 79ca1898fd6..0f48b24b3b8 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc +++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc @@ -4,7 +4,7 @@ project(EventSink_stub): ccm_stub { sharedname = EventSink_stub - idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h + idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h -Gxhst -Gxhsk dynamicflags = EVENTSINK_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h deleted file mode 100644 index e2a7f876165..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_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 EVENTSINK_STUB -// ------------------------------ -#ifndef EVENTSINK_STUB_EXPORT_H -#define EVENTSINK_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSINK_STUB_HAS_DLL) -# define EVENTSINK_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && EVENTSINK_STUB_HAS_DLL */ - -#if !defined (EVENTSINK_STUB_HAS_DLL) -# define EVENTSINK_STUB_HAS_DLL 1 -#endif /* ! EVENTSINK_STUB_HAS_DLL */ - -#if defined (EVENTSINK_STUB_HAS_DLL) && (EVENTSINK_STUB_HAS_DLL == 1) -# if defined (EVENTSINK_STUB_BUILD_DLL) -# define EVENTSINK_STUB_Export ACE_Proper_Export_Flag -# define EVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EVENTSINK_STUB_BUILD_DLL */ -# define EVENTSINK_STUB_Export ACE_Proper_Import_Flag -# define EVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EVENTSINK_STUB_BUILD_DLL */ -#else /* EVENTSINK_STUB_HAS_DLL == 1 */ -# define EVENTSINK_STUB_Export -# define EVENTSINK_STUB_SINGLETON_DECLARATION(T) -# define EVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EVENTSINK_STUB_HAS_DLL == 1 */ - -// Set EVENTSINK_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EVENTSINK_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define EVENTSINK_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EVENTSINK_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EVENTSINK_STUB_NTRACE */ - -#if (EVENTSINK_STUB_NTRACE == 1) -# define EVENTSINK_STUB_TRACE(X) -#else /* (EVENTSINK_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EVENTSINK_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EVENTSINK_STUB_NTRACE == 1) */ - -#endif /* EVENTSINK_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h deleted file mode 100644 index b30cb9768c2..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_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 EVENTSINK_SVNT -// ------------------------------ -#ifndef EVENTSINK_SVNT_EXPORT_H -#define EVENTSINK_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSINK_SVNT_HAS_DLL) -# define EVENTSINK_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && EVENTSINK_SVNT_HAS_DLL */ - -#if !defined (EVENTSINK_SVNT_HAS_DLL) -# define EVENTSINK_SVNT_HAS_DLL 1 -#endif /* ! EVENTSINK_SVNT_HAS_DLL */ - -#if defined (EVENTSINK_SVNT_HAS_DLL) && (EVENTSINK_SVNT_HAS_DLL == 1) -# if defined (EVENTSINK_SVNT_BUILD_DLL) -# define EVENTSINK_SVNT_Export ACE_Proper_Export_Flag -# define EVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EVENTSINK_SVNT_BUILD_DLL */ -# define EVENTSINK_SVNT_Export ACE_Proper_Import_Flag -# define EVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EVENTSINK_SVNT_BUILD_DLL */ -#else /* EVENTSINK_SVNT_HAS_DLL == 1 */ -# define EVENTSINK_SVNT_Export -# define EVENTSINK_SVNT_SINGLETON_DECLARATION(T) -# define EVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EVENTSINK_SVNT_HAS_DLL == 1 */ - -// Set EVENTSINK_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EVENTSINK_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define EVENTSINK_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EVENTSINK_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EVENTSINK_SVNT_NTRACE */ - -#if (EVENTSINK_SVNT_NTRACE == 1) -# define EVENTSINK_SVNT_TRACE(X) -#else /* (EVENTSINK_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EVENTSINK_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EVENTSINK_SVNT_NTRACE == 1) */ - -#endif /* EVENTSINK_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc index 5f81314a9cf..8701b0ffe4e 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc +++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc @@ -4,7 +4,7 @@ project(EventSource_stub): ccm_stub { sharedname = EventSource_stub - idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h + idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h -Gxhst -Gxhsk dynamicflags = EVENTSOURCE_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h deleted file mode 100644 index a0cf71bbe6d..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_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 EVENTSOURCE_STUB -// ------------------------------ -#ifndef EVENTSOURCE_STUB_EXPORT_H -#define EVENTSOURCE_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSOURCE_STUB_HAS_DLL) -# define EVENTSOURCE_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && EVENTSOURCE_STUB_HAS_DLL */ - -#if !defined (EVENTSOURCE_STUB_HAS_DLL) -# define EVENTSOURCE_STUB_HAS_DLL 1 -#endif /* ! EVENTSOURCE_STUB_HAS_DLL */ - -#if defined (EVENTSOURCE_STUB_HAS_DLL) && (EVENTSOURCE_STUB_HAS_DLL == 1) -# if defined (EVENTSOURCE_STUB_BUILD_DLL) -# define EVENTSOURCE_STUB_Export ACE_Proper_Export_Flag -# define EVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EVENTSOURCE_STUB_BUILD_DLL */ -# define EVENTSOURCE_STUB_Export ACE_Proper_Import_Flag -# define EVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EVENTSOURCE_STUB_BUILD_DLL */ -#else /* EVENTSOURCE_STUB_HAS_DLL == 1 */ -# define EVENTSOURCE_STUB_Export -# define EVENTSOURCE_STUB_SINGLETON_DECLARATION(T) -# define EVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EVENTSOURCE_STUB_HAS_DLL == 1 */ - -// Set EVENTSOURCE_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EVENTSOURCE_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define EVENTSOURCE_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EVENTSOURCE_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EVENTSOURCE_STUB_NTRACE */ - -#if (EVENTSOURCE_STUB_NTRACE == 1) -# define EVENTSOURCE_STUB_TRACE(X) -#else /* (EVENTSOURCE_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EVENTSOURCE_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EVENTSOURCE_STUB_NTRACE == 1) */ - -#endif /* EVENTSOURCE_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h deleted file mode 100644 index dd5eeacd906..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_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 EVENTSOURCE_SVNT -// ------------------------------ -#ifndef EVENTSOURCE_SVNT_EXPORT_H -#define EVENTSOURCE_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSOURCE_SVNT_HAS_DLL) -# define EVENTSOURCE_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && EVENTSOURCE_SVNT_HAS_DLL */ - -#if !defined (EVENTSOURCE_SVNT_HAS_DLL) -# define EVENTSOURCE_SVNT_HAS_DLL 1 -#endif /* ! EVENTSOURCE_SVNT_HAS_DLL */ - -#if defined (EVENTSOURCE_SVNT_HAS_DLL) && (EVENTSOURCE_SVNT_HAS_DLL == 1) -# if defined (EVENTSOURCE_SVNT_BUILD_DLL) -# define EVENTSOURCE_SVNT_Export ACE_Proper_Export_Flag -# define EVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EVENTSOURCE_SVNT_BUILD_DLL */ -# define EVENTSOURCE_SVNT_Export ACE_Proper_Import_Flag -# define EVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EVENTSOURCE_SVNT_BUILD_DLL */ -#else /* EVENTSOURCE_SVNT_HAS_DLL == 1 */ -# define EVENTSOURCE_SVNT_Export -# define EVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) -# define EVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EVENTSOURCE_SVNT_HAS_DLL == 1 */ - -// Set EVENTSOURCE_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EVENTSOURCE_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define EVENTSOURCE_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EVENTSOURCE_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EVENTSOURCE_SVNT_NTRACE */ - -#if (EVENTSOURCE_SVNT_NTRACE == 1) -# define EVENTSOURCE_SVNT_TRACE(X) -#else /* (EVENTSOURCE_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EVENTSOURCE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EVENTSOURCE_SVNT_NTRACE == 1) */ - -#endif /* EVENTSOURCE_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc index ab3da28df3d..81689a22b1a 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc +++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc @@ -4,7 +4,7 @@ project(Facets_stub): ccm_stub { sharedname = Facets_stub - idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h + idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h -Gxhst -Gxhsk dynamicflags = FACETS_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h deleted file mode 100644 index 025fc8215f2..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_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 FACETS_STUB -// ------------------------------ -#ifndef FACETS_STUB_EXPORT_H -#define FACETS_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (FACETS_STUB_HAS_DLL) -# define FACETS_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && FACETS_STUB_HAS_DLL */ - -#if !defined (FACETS_STUB_HAS_DLL) -# define FACETS_STUB_HAS_DLL 1 -#endif /* ! FACETS_STUB_HAS_DLL */ - -#if defined (FACETS_STUB_HAS_DLL) && (FACETS_STUB_HAS_DLL == 1) -# if defined (FACETS_STUB_BUILD_DLL) -# define FACETS_STUB_Export ACE_Proper_Export_Flag -# define FACETS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define FACETS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* FACETS_STUB_BUILD_DLL */ -# define FACETS_STUB_Export ACE_Proper_Import_Flag -# define FACETS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define FACETS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* FACETS_STUB_BUILD_DLL */ -#else /* FACETS_STUB_HAS_DLL == 1 */ -# define FACETS_STUB_Export -# define FACETS_STUB_SINGLETON_DECLARATION(T) -# define FACETS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* FACETS_STUB_HAS_DLL == 1 */ - -// Set FACETS_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (FACETS_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define FACETS_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define FACETS_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !FACETS_STUB_NTRACE */ - -#if (FACETS_STUB_NTRACE == 1) -# define FACETS_STUB_TRACE(X) -#else /* (FACETS_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define FACETS_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (FACETS_STUB_NTRACE == 1) */ - -#endif /* FACETS_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h deleted file mode 100644 index e4750de9b91..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_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 FACETS_SVNT -// ------------------------------ -#ifndef FACETS_SVNT_EXPORT_H -#define FACETS_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (FACETS_SVNT_HAS_DLL) -# define FACETS_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && FACETS_SVNT_HAS_DLL */ - -#if !defined (FACETS_SVNT_HAS_DLL) -# define FACETS_SVNT_HAS_DLL 1 -#endif /* ! FACETS_SVNT_HAS_DLL */ - -#if defined (FACETS_SVNT_HAS_DLL) && (FACETS_SVNT_HAS_DLL == 1) -# if defined (FACETS_SVNT_BUILD_DLL) -# define FACETS_SVNT_Export ACE_Proper_Export_Flag -# define FACETS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define FACETS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* FACETS_SVNT_BUILD_DLL */ -# define FACETS_SVNT_Export ACE_Proper_Import_Flag -# define FACETS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define FACETS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* FACETS_SVNT_BUILD_DLL */ -#else /* FACETS_SVNT_HAS_DLL == 1 */ -# define FACETS_SVNT_Export -# define FACETS_SVNT_SINGLETON_DECLARATION(T) -# define FACETS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* FACETS_SVNT_HAS_DLL == 1 */ - -// Set FACETS_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (FACETS_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define FACETS_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define FACETS_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !FACETS_SVNT_NTRACE */ - -#if (FACETS_SVNT_NTRACE == 1) -# define FACETS_SVNT_TRACE(X) -#else /* (FACETS_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define FACETS_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (FACETS_SVNT_NTRACE == 1) */ - -#endif /* FACETS_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc index 401f8d0c5c1..04b861cb5e2 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc +++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc @@ -7,8 +7,8 @@ project(Receptacles_stub): ccm_stub { idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export \ -Wb,stub_export_include=Receptacles_stub_export.h \ -Wb,skel_export_macro=RECEPTACLES_SVNT_Export \ - -Wb,skel_export_include=Receptacles_svnt_export.h - + -Wb,skel_export_include=Receptacles_svnt_export.h -Gxhst -Gxhsk + dynamicflags = RECEPTACLES_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h deleted file mode 100644 index 15dedbc8a73..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_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 RECEPTACLES_STUB -// ------------------------------ -#ifndef RECEPTACLES_STUB_EXPORT_H -#define RECEPTACLES_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEPTACLES_STUB_HAS_DLL) -# define RECEPTACLES_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && RECEPTACLES_STUB_HAS_DLL */ - -#if !defined (RECEPTACLES_STUB_HAS_DLL) -# define RECEPTACLES_STUB_HAS_DLL 1 -#endif /* ! RECEPTACLES_STUB_HAS_DLL */ - -#if defined (RECEPTACLES_STUB_HAS_DLL) && (RECEPTACLES_STUB_HAS_DLL == 1) -# if defined (RECEPTACLES_STUB_BUILD_DLL) -# define RECEPTACLES_STUB_Export ACE_Proper_Export_Flag -# define RECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define RECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* RECEPTACLES_STUB_BUILD_DLL */ -# define RECEPTACLES_STUB_Export ACE_Proper_Import_Flag -# define RECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define RECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* RECEPTACLES_STUB_BUILD_DLL */ -#else /* RECEPTACLES_STUB_HAS_DLL == 1 */ -# define RECEPTACLES_STUB_Export -# define RECEPTACLES_STUB_SINGLETON_DECLARATION(T) -# define RECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* RECEPTACLES_STUB_HAS_DLL == 1 */ - -// Set RECEPTACLES_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (RECEPTACLES_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define RECEPTACLES_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define RECEPTACLES_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !RECEPTACLES_STUB_NTRACE */ - -#if (RECEPTACLES_STUB_NTRACE == 1) -# define RECEPTACLES_STUB_TRACE(X) -#else /* (RECEPTACLES_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define RECEPTACLES_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (RECEPTACLES_STUB_NTRACE == 1) */ - -#endif /* RECEPTACLES_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h deleted file mode 100644 index 4a4a4f52dcd..00000000000 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_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 RECEPTACLES_SVNT -// ------------------------------ -#ifndef RECEPTACLES_SVNT_EXPORT_H -#define RECEPTACLES_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEPTACLES_SVNT_HAS_DLL) -# define RECEPTACLES_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && RECEPTACLES_SVNT_HAS_DLL */ - -#if !defined (RECEPTACLES_SVNT_HAS_DLL) -# define RECEPTACLES_SVNT_HAS_DLL 1 -#endif /* ! RECEPTACLES_SVNT_HAS_DLL */ - -#if defined (RECEPTACLES_SVNT_HAS_DLL) && (RECEPTACLES_SVNT_HAS_DLL == 1) -# if defined (RECEPTACLES_SVNT_BUILD_DLL) -# define RECEPTACLES_SVNT_Export ACE_Proper_Export_Flag -# define RECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define RECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* RECEPTACLES_SVNT_BUILD_DLL */ -# define RECEPTACLES_SVNT_Export ACE_Proper_Import_Flag -# define RECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define RECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* RECEPTACLES_SVNT_BUILD_DLL */ -#else /* RECEPTACLES_SVNT_HAS_DLL == 1 */ -# define RECEPTACLES_SVNT_Export -# define RECEPTACLES_SVNT_SINGLETON_DECLARATION(T) -# define RECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* RECEPTACLES_SVNT_HAS_DLL == 1 */ - -// Set RECEPTACLES_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (RECEPTACLES_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define RECEPTACLES_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define RECEPTACLES_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !RECEPTACLES_SVNT_NTRACE */ - -#if (RECEPTACLES_SVNT_NTRACE == 1) -# define RECEPTACLES_SVNT_TRACE(X) -#else /* (RECEPTACLES_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define RECEPTACLES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (RECEPTACLES_SVNT_NTRACE == 1) */ - -#endif /* RECEPTACLES_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc index f2b44a8123e..47a76f8ccc4 100644 --- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc +++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc @@ -7,8 +7,8 @@ project(SimpleComponent_stub_idl3): ccm_stub { idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export \ -Wb,stub_export_include=SimpleComponent_stub_export.h \ -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export \ - -Wb,skel_export_include=SimpleComponent_svnt_export.h - + -Wb,skel_export_include=SimpleComponent_svnt_export.h -Gxhst -Gxhsk + dynamicflags = SIMPLECOMPONENT_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h deleted file mode 100644 index add746da8f5..00000000000 --- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_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 SIMPLECOMPONENT_EXEC -// ------------------------------ -#ifndef SIMPLECOMPONENT_EXEC_EXPORT_H -#define SIMPLECOMPONENT_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_EXEC_HAS_DLL) -# define SIMPLECOMPONENT_EXEC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_EXEC_HAS_DLL */ - -#if !defined (SIMPLECOMPONENT_EXEC_HAS_DLL) -# define SIMPLECOMPONENT_EXEC_HAS_DLL 1 -#endif /* ! SIMPLECOMPONENT_EXEC_HAS_DLL */ - -#if defined (SIMPLECOMPONENT_EXEC_HAS_DLL) && (SIMPLECOMPONENT_EXEC_HAS_DLL == 1) -# if defined (SIMPLECOMPONENT_EXEC_BUILD_DLL) -# define SIMPLECOMPONENT_EXEC_Export ACE_Proper_Export_Flag -# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* SIMPLECOMPONENT_EXEC_BUILD_DLL */ -# define SIMPLECOMPONENT_EXEC_Export ACE_Proper_Import_Flag -# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* SIMPLECOMPONENT_EXEC_BUILD_DLL */ -#else /* SIMPLECOMPONENT_EXEC_HAS_DLL == 1 */ -# define SIMPLECOMPONENT_EXEC_Export -# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARATION(T) -# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* SIMPLECOMPONENT_EXEC_HAS_DLL == 1 */ - -// Set SIMPLECOMPONENT_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (SIMPLECOMPONENT_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define SIMPLECOMPONENT_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define SIMPLECOMPONENT_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !SIMPLECOMPONENT_EXEC_NTRACE */ - -#if (SIMPLECOMPONENT_EXEC_NTRACE == 1) -# define SIMPLECOMPONENT_EXEC_TRACE(X) -#else /* (SIMPLECOMPONENT_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define SIMPLECOMPONENT_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (SIMPLECOMPONENT_EXEC_NTRACE == 1) */ - -#endif /* SIMPLECOMPONENT_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h deleted file mode 100644 index eb8cb7a6c97..00000000000 --- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_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 SIMPLECOMPONENT_STUB -// ------------------------------ -#ifndef SIMPLECOMPONENT_STUB_EXPORT_H -#define SIMPLECOMPONENT_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_STUB_HAS_DLL) -# define SIMPLECOMPONENT_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_STUB_HAS_DLL */ - -#if !defined (SIMPLECOMPONENT_STUB_HAS_DLL) -# define SIMPLECOMPONENT_STUB_HAS_DLL 1 -#endif /* ! SIMPLECOMPONENT_STUB_HAS_DLL */ - -#if defined (SIMPLECOMPONENT_STUB_HAS_DLL) && (SIMPLECOMPONENT_STUB_HAS_DLL == 1) -# if defined (SIMPLECOMPONENT_STUB_BUILD_DLL) -# define SIMPLECOMPONENT_STUB_Export ACE_Proper_Export_Flag -# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* SIMPLECOMPONENT_STUB_BUILD_DLL */ -# define SIMPLECOMPONENT_STUB_Export ACE_Proper_Import_Flag -# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* SIMPLECOMPONENT_STUB_BUILD_DLL */ -#else /* SIMPLECOMPONENT_STUB_HAS_DLL == 1 */ -# define SIMPLECOMPONENT_STUB_Export -# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARATION(T) -# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* SIMPLECOMPONENT_STUB_HAS_DLL == 1 */ - -// Set SIMPLECOMPONENT_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (SIMPLECOMPONENT_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define SIMPLECOMPONENT_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define SIMPLECOMPONENT_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !SIMPLECOMPONENT_STUB_NTRACE */ - -#if (SIMPLECOMPONENT_STUB_NTRACE == 1) -# define SIMPLECOMPONENT_STUB_TRACE(X) -#else /* (SIMPLECOMPONENT_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define SIMPLECOMPONENT_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (SIMPLECOMPONENT_STUB_NTRACE == 1) */ - -#endif /* SIMPLECOMPONENT_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h deleted file mode 100644 index 694af85e994..00000000000 --- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_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 SIMPLECOMPONENT_SVNT -// ------------------------------ -#ifndef SIMPLECOMPONENT_SVNT_EXPORT_H -#define SIMPLECOMPONENT_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_SVNT_HAS_DLL) -# define SIMPLECOMPONENT_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_SVNT_HAS_DLL */ - -#if !defined (SIMPLECOMPONENT_SVNT_HAS_DLL) -# define SIMPLECOMPONENT_SVNT_HAS_DLL 1 -#endif /* ! SIMPLECOMPONENT_SVNT_HAS_DLL */ - -#if defined (SIMPLECOMPONENT_SVNT_HAS_DLL) && (SIMPLECOMPONENT_SVNT_HAS_DLL == 1) -# if defined (SIMPLECOMPONENT_SVNT_BUILD_DLL) -# define SIMPLECOMPONENT_SVNT_Export ACE_Proper_Export_Flag -# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* SIMPLECOMPONENT_SVNT_BUILD_DLL */ -# define SIMPLECOMPONENT_SVNT_Export ACE_Proper_Import_Flag -# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* SIMPLECOMPONENT_SVNT_BUILD_DLL */ -#else /* SIMPLECOMPONENT_SVNT_HAS_DLL == 1 */ -# define SIMPLECOMPONENT_SVNT_Export -# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARATION(T) -# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* SIMPLECOMPONENT_SVNT_HAS_DLL == 1 */ - -// Set SIMPLECOMPONENT_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (SIMPLECOMPONENT_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define SIMPLECOMPONENT_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define SIMPLECOMPONENT_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !SIMPLECOMPONENT_SVNT_NTRACE */ - -#if (SIMPLECOMPONENT_SVNT_NTRACE == 1) -# define SIMPLECOMPONENT_SVNT_TRACE(X) -#else /* (SIMPLECOMPONENT_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define SIMPLECOMPONENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (SIMPLECOMPONENT_SVNT_NTRACE == 1) */ - -#endif /* SIMPLECOMPONENT_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc index 83d67de5f39..a89d0d2d968 100644 --- a/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc +++ b/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc @@ -4,7 +4,7 @@ project(Abstract_stub): ccm_stub { sharedname = Abstract_stub - idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h + idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h -Gxhst -Gxhsk dynamicflags = ABSTRACT_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h b/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h deleted file mode 100644 index 2ec86f36950..00000000000 --- a/CIAO/tests/IDL3/Events/Abstract/Abstract_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 ABSTRACT_STUB -// ------------------------------ -#ifndef ABSTRACT_STUB_EXPORT_H -#define ABSTRACT_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ABSTRACT_STUB_HAS_DLL) -# define ABSTRACT_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ABSTRACT_STUB_HAS_DLL */ - -#if !defined (ABSTRACT_STUB_HAS_DLL) -# define ABSTRACT_STUB_HAS_DLL 1 -#endif /* ! ABSTRACT_STUB_HAS_DLL */ - -#if defined (ABSTRACT_STUB_HAS_DLL) && (ABSTRACT_STUB_HAS_DLL == 1) -# if defined (ABSTRACT_STUB_BUILD_DLL) -# define ABSTRACT_STUB_Export ACE_Proper_Export_Flag -# define ABSTRACT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ABSTRACT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ABSTRACT_STUB_BUILD_DLL */ -# define ABSTRACT_STUB_Export ACE_Proper_Import_Flag -# define ABSTRACT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ABSTRACT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ABSTRACT_STUB_BUILD_DLL */ -#else /* ABSTRACT_STUB_HAS_DLL == 1 */ -# define ABSTRACT_STUB_Export -# define ABSTRACT_STUB_SINGLETON_DECLARATION(T) -# define ABSTRACT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ABSTRACT_STUB_HAS_DLL == 1 */ - -// Set ABSTRACT_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ABSTRACT_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ABSTRACT_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ABSTRACT_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ABSTRACT_STUB_NTRACE */ - -#if (ABSTRACT_STUB_NTRACE == 1) -# define ABSTRACT_STUB_TRACE(X) -#else /* (ABSTRACT_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ABSTRACT_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ABSTRACT_STUB_NTRACE == 1) */ - -#endif /* ABSTRACT_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h b/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h deleted file mode 100644 index 890926fec22..00000000000 --- a/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_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 ABSTRACT_SVNT -// ------------------------------ -#ifndef ABSTRACT_SVNT_EXPORT_H -#define ABSTRACT_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ABSTRACT_SVNT_HAS_DLL) -# define ABSTRACT_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ABSTRACT_SVNT_HAS_DLL */ - -#if !defined (ABSTRACT_SVNT_HAS_DLL) -# define ABSTRACT_SVNT_HAS_DLL 1 -#endif /* ! ABSTRACT_SVNT_HAS_DLL */ - -#if defined (ABSTRACT_SVNT_HAS_DLL) && (ABSTRACT_SVNT_HAS_DLL == 1) -# if defined (ABSTRACT_SVNT_BUILD_DLL) -# define ABSTRACT_SVNT_Export ACE_Proper_Export_Flag -# define ABSTRACT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ABSTRACT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ABSTRACT_SVNT_BUILD_DLL */ -# define ABSTRACT_SVNT_Export ACE_Proper_Import_Flag -# define ABSTRACT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ABSTRACT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ABSTRACT_SVNT_BUILD_DLL */ -#else /* ABSTRACT_SVNT_HAS_DLL == 1 */ -# define ABSTRACT_SVNT_Export -# define ABSTRACT_SVNT_SINGLETON_DECLARATION(T) -# define ABSTRACT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ABSTRACT_SVNT_HAS_DLL == 1 */ - -// Set ABSTRACT_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ABSTRACT_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ABSTRACT_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ABSTRACT_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ABSTRACT_SVNT_NTRACE */ - -#if (ABSTRACT_SVNT_NTRACE == 1) -# define ABSTRACT_SVNT_TRACE(X) -#else /* (ABSTRACT_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ABSTRACT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ABSTRACT_SVNT_NTRACE == 1) */ - -#endif /* ABSTRACT_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/CIAO/tests/IDL3/Events/Regular/Regular.mpc index 6186490384c..cf90fc267d4 100644 --- a/CIAO/tests/IDL3/Events/Regular/Regular.mpc +++ b/CIAO/tests/IDL3/Events/Regular/Regular.mpc @@ -7,7 +7,7 @@ project(Regular_stub): ccm_stub { idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export \ -Wb,stub_export_include=Regular_stub_export.h \ -Wb,skel_export_macro=REGULAR_SVNT_Export \ - -Wb,skel_export_include=Regular_svnt_export.h + -Wb,skel_export_include=Regular_svnt_export.h -Gxhst -Gxhsk dynamicflags = REGULAR_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h b/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h deleted file mode 100644 index 7185b7d78b2..00000000000 --- a/CIAO/tests/IDL3/Events/Regular/Regular_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 REGULAR_STUB -// ------------------------------ -#ifndef REGULAR_STUB_EXPORT_H -#define REGULAR_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (REGULAR_STUB_HAS_DLL) -# define REGULAR_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && REGULAR_STUB_HAS_DLL */ - -#if !defined (REGULAR_STUB_HAS_DLL) -# define REGULAR_STUB_HAS_DLL 1 -#endif /* ! REGULAR_STUB_HAS_DLL */ - -#if defined (REGULAR_STUB_HAS_DLL) && (REGULAR_STUB_HAS_DLL == 1) -# if defined (REGULAR_STUB_BUILD_DLL) -# define REGULAR_STUB_Export ACE_Proper_Export_Flag -# define REGULAR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define REGULAR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* REGULAR_STUB_BUILD_DLL */ -# define REGULAR_STUB_Export ACE_Proper_Import_Flag -# define REGULAR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define REGULAR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* REGULAR_STUB_BUILD_DLL */ -#else /* REGULAR_STUB_HAS_DLL == 1 */ -# define REGULAR_STUB_Export -# define REGULAR_STUB_SINGLETON_DECLARATION(T) -# define REGULAR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* REGULAR_STUB_HAS_DLL == 1 */ - -// Set REGULAR_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (REGULAR_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define REGULAR_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define REGULAR_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !REGULAR_STUB_NTRACE */ - -#if (REGULAR_STUB_NTRACE == 1) -# define REGULAR_STUB_TRACE(X) -#else /* (REGULAR_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define REGULAR_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (REGULAR_STUB_NTRACE == 1) */ - -#endif /* REGULAR_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h b/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h deleted file mode 100644 index 05a2687b566..00000000000 --- a/CIAO/tests/IDL3/Events/Regular/Regular_svnt_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 REGULAR_SVNT -// ------------------------------ -#ifndef REGULAR_SVNT_EXPORT_H -#define REGULAR_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (REGULAR_SVNT_HAS_DLL) -# define REGULAR_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && REGULAR_SVNT_HAS_DLL */ - -#if !defined (REGULAR_SVNT_HAS_DLL) -# define REGULAR_SVNT_HAS_DLL 1 -#endif /* ! REGULAR_SVNT_HAS_DLL */ - -#if defined (REGULAR_SVNT_HAS_DLL) && (REGULAR_SVNT_HAS_DLL == 1) -# if defined (REGULAR_SVNT_BUILD_DLL) -# define REGULAR_SVNT_Export ACE_Proper_Export_Flag -# define REGULAR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define REGULAR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* REGULAR_SVNT_BUILD_DLL */ -# define REGULAR_SVNT_Export ACE_Proper_Import_Flag -# define REGULAR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define REGULAR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* REGULAR_SVNT_BUILD_DLL */ -#else /* REGULAR_SVNT_HAS_DLL == 1 */ -# define REGULAR_SVNT_Export -# define REGULAR_SVNT_SINGLETON_DECLARATION(T) -# define REGULAR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* REGULAR_SVNT_HAS_DLL == 1 */ - -// Set REGULAR_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (REGULAR_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define REGULAR_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define REGULAR_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !REGULAR_SVNT_NTRACE */ - -#if (REGULAR_SVNT_NTRACE == 1) -# define REGULAR_SVNT_TRACE(X) -#else /* (REGULAR_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define REGULAR_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (REGULAR_SVNT_NTRACE == 1) */ - -#endif /* REGULAR_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc index 063c212b83a..7824a77399f 100644 --- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc +++ b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc @@ -4,7 +4,7 @@ project(HomeAttributes_stub): ccm_stub { sharedname = HomeAttributes_stub - idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h + idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h -Gxhst -Gxhsk dynamicflags = HOMEATTRIBUTES_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h deleted file mode 100644 index f347446a533..00000000000 --- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_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 HOMEATTRIBUTES_STUB -// ------------------------------ -#ifndef HOMEATTRIBUTES_STUB_EXPORT_H -#define HOMEATTRIBUTES_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMEATTRIBUTES_STUB_HAS_DLL) -# define HOMEATTRIBUTES_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && HOMEATTRIBUTES_STUB_HAS_DLL */ - -#if !defined (HOMEATTRIBUTES_STUB_HAS_DLL) -# define HOMEATTRIBUTES_STUB_HAS_DLL 1 -#endif /* ! HOMEATTRIBUTES_STUB_HAS_DLL */ - -#if defined (HOMEATTRIBUTES_STUB_HAS_DLL) && (HOMEATTRIBUTES_STUB_HAS_DLL == 1) -# if defined (HOMEATTRIBUTES_STUB_BUILD_DLL) -# define HOMEATTRIBUTES_STUB_Export ACE_Proper_Export_Flag -# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HOMEATTRIBUTES_STUB_BUILD_DLL */ -# define HOMEATTRIBUTES_STUB_Export ACE_Proper_Import_Flag -# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HOMEATTRIBUTES_STUB_BUILD_DLL */ -#else /* HOMEATTRIBUTES_STUB_HAS_DLL == 1 */ -# define HOMEATTRIBUTES_STUB_Export -# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARATION(T) -# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HOMEATTRIBUTES_STUB_HAS_DLL == 1 */ - -// Set HOMEATTRIBUTES_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HOMEATTRIBUTES_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define HOMEATTRIBUTES_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HOMEATTRIBUTES_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HOMEATTRIBUTES_STUB_NTRACE */ - -#if (HOMEATTRIBUTES_STUB_NTRACE == 1) -# define HOMEATTRIBUTES_STUB_TRACE(X) -#else /* (HOMEATTRIBUTES_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HOMEATTRIBUTES_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HOMEATTRIBUTES_STUB_NTRACE == 1) */ - -#endif /* HOMEATTRIBUTES_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h deleted file mode 100644 index f99dd7694f3..00000000000 --- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_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 HOMEATTRIBUTES_SVNT -// ------------------------------ -#ifndef HOMEATTRIBUTES_SVNT_EXPORT_H -#define HOMEATTRIBUTES_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMEATTRIBUTES_SVNT_HAS_DLL) -# define HOMEATTRIBUTES_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && HOMEATTRIBUTES_SVNT_HAS_DLL */ - -#if !defined (HOMEATTRIBUTES_SVNT_HAS_DLL) -# define HOMEATTRIBUTES_SVNT_HAS_DLL 1 -#endif /* ! HOMEATTRIBUTES_SVNT_HAS_DLL */ - -#if defined (HOMEATTRIBUTES_SVNT_HAS_DLL) && (HOMEATTRIBUTES_SVNT_HAS_DLL == 1) -# if defined (HOMEATTRIBUTES_SVNT_BUILD_DLL) -# define HOMEATTRIBUTES_SVNT_Export ACE_Proper_Export_Flag -# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HOMEATTRIBUTES_SVNT_BUILD_DLL */ -# define HOMEATTRIBUTES_SVNT_Export ACE_Proper_Import_Flag -# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HOMEATTRIBUTES_SVNT_BUILD_DLL */ -#else /* HOMEATTRIBUTES_SVNT_HAS_DLL == 1 */ -# define HOMEATTRIBUTES_SVNT_Export -# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) -# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HOMEATTRIBUTES_SVNT_HAS_DLL == 1 */ - -// Set HOMEATTRIBUTES_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HOMEATTRIBUTES_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define HOMEATTRIBUTES_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HOMEATTRIBUTES_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HOMEATTRIBUTES_SVNT_NTRACE */ - -#if (HOMEATTRIBUTES_SVNT_NTRACE == 1) -# define HOMEATTRIBUTES_SVNT_TRACE(X) -#else /* (HOMEATTRIBUTES_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HOMEATTRIBUTES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HOMEATTRIBUTES_SVNT_NTRACE == 1) */ - -#endif /* HOMEATTRIBUTES_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/CIAO/tests/IDL3/Homes/Basic/Basic.mpc index f676e9d9b70..84d3b05f353 100644 --- a/CIAO/tests/IDL3/Homes/Basic/Basic.mpc +++ b/CIAO/tests/IDL3/Homes/Basic/Basic.mpc @@ -4,7 +4,7 @@ project(IDL3_Basic_stub): ccm_stub { sharedname = Homes_Basic_stub - idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h + idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h -Gxhst -Gxhsk dynamicflags = BASIC_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h b/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h deleted file mode 100644 index 469d1f6827c..00000000000 --- a/CIAO/tests/IDL3/Homes/Basic/Basic_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 BASIC_STUB -// ------------------------------ -#ifndef BASIC_STUB_EXPORT_H -#define BASIC_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_STUB_HAS_DLL) -# define BASIC_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && BASIC_STUB_HAS_DLL */ - -#if !defined (BASIC_STUB_HAS_DLL) -# define BASIC_STUB_HAS_DLL 1 -#endif /* ! BASIC_STUB_HAS_DLL */ - -#if defined (BASIC_STUB_HAS_DLL) && (BASIC_STUB_HAS_DLL == 1) -# if defined (BASIC_STUB_BUILD_DLL) -# define BASIC_STUB_Export ACE_Proper_Export_Flag -# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* BASIC_STUB_BUILD_DLL */ -# define BASIC_STUB_Export ACE_Proper_Import_Flag -# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* BASIC_STUB_BUILD_DLL */ -#else /* BASIC_STUB_HAS_DLL == 1 */ -# define BASIC_STUB_Export -# define BASIC_STUB_SINGLETON_DECLARATION(T) -# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* BASIC_STUB_HAS_DLL == 1 */ - -// Set BASIC_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (BASIC_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define BASIC_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define BASIC_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !BASIC_STUB_NTRACE */ - -#if (BASIC_STUB_NTRACE == 1) -# define BASIC_STUB_TRACE(X) -#else /* (BASIC_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define BASIC_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (BASIC_STUB_NTRACE == 1) */ - -#endif /* BASIC_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h b/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h deleted file mode 100644 index 569fe626ebc..00000000000 --- a/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_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 BASIC_SVNT -// ------------------------------ -#ifndef BASIC_SVNT_EXPORT_H -#define BASIC_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_SVNT_HAS_DLL) -# define BASIC_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && BASIC_SVNT_HAS_DLL */ - -#if !defined (BASIC_SVNT_HAS_DLL) -# define BASIC_SVNT_HAS_DLL 1 -#endif /* ! BASIC_SVNT_HAS_DLL */ - -#if defined (BASIC_SVNT_HAS_DLL) && (BASIC_SVNT_HAS_DLL == 1) -# if defined (BASIC_SVNT_BUILD_DLL) -# define BASIC_SVNT_Export ACE_Proper_Export_Flag -# define BASIC_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* BASIC_SVNT_BUILD_DLL */ -# define BASIC_SVNT_Export ACE_Proper_Import_Flag -# define BASIC_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* BASIC_SVNT_BUILD_DLL */ -#else /* BASIC_SVNT_HAS_DLL == 1 */ -# define BASIC_SVNT_Export -# define BASIC_SVNT_SINGLETON_DECLARATION(T) -# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* BASIC_SVNT_HAS_DLL == 1 */ - -// Set BASIC_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (BASIC_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define BASIC_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define BASIC_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !BASIC_SVNT_NTRACE */ - -#if (BASIC_SVNT_NTRACE == 1) -# define BASIC_SVNT_TRACE(X) -#else /* (BASIC_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define BASIC_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (BASIC_SVNT_NTRACE == 1) */ - -#endif /* BASIC_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/CIAO/tests/IDL3/Homes/Factory/Factory.mpc index 90aed185da2..e59044578b4 100644 --- a/CIAO/tests/IDL3/Homes/Factory/Factory.mpc +++ b/CIAO/tests/IDL3/Homes/Factory/Factory.mpc @@ -4,7 +4,7 @@ project(Factory_stub): ccm_stub { sharedname = Factory_stub - idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h + idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h -Gxhst -Gxhsk dynamicflags = FACTORY_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h b/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h deleted file mode 100644 index 4a5cbf3ac4e..00000000000 --- a/CIAO/tests/IDL3/Homes/Factory/Factory_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 FACTORY_STUB -// ------------------------------ -#ifndef FACTORY_STUB_EXPORT_H -#define FACTORY_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (FACTORY_STUB_HAS_DLL) -# define FACTORY_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && FACTORY_STUB_HAS_DLL */ - -#if !defined (FACTORY_STUB_HAS_DLL) -# define FACTORY_STUB_HAS_DLL 1 -#endif /* ! FACTORY_STUB_HAS_DLL */ - -#if defined (FACTORY_STUB_HAS_DLL) && (FACTORY_STUB_HAS_DLL == 1) -# if defined (FACTORY_STUB_BUILD_DLL) -# define FACTORY_STUB_Export ACE_Proper_Export_Flag -# define FACTORY_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define FACTORY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* FACTORY_STUB_BUILD_DLL */ -# define FACTORY_STUB_Export ACE_Proper_Import_Flag -# define FACTORY_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define FACTORY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* FACTORY_STUB_BUILD_DLL */ -#else /* FACTORY_STUB_HAS_DLL == 1 */ -# define FACTORY_STUB_Export -# define FACTORY_STUB_SINGLETON_DECLARATION(T) -# define FACTORY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* FACTORY_STUB_HAS_DLL == 1 */ - -// Set FACTORY_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (FACTORY_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define FACTORY_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define FACTORY_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !FACTORY_STUB_NTRACE */ - -#if (FACTORY_STUB_NTRACE == 1) -# define FACTORY_STUB_TRACE(X) -#else /* (FACTORY_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define FACTORY_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (FACTORY_STUB_NTRACE == 1) */ - -#endif /* FACTORY_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h b/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h deleted file mode 100644 index 3bfb6c71d9e..00000000000 --- a/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_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 FACTORY_SVNT -// ------------------------------ -#ifndef FACTORY_SVNT_EXPORT_H -#define FACTORY_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (FACTORY_SVNT_HAS_DLL) -# define FACTORY_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && FACTORY_SVNT_HAS_DLL */ - -#if !defined (FACTORY_SVNT_HAS_DLL) -# define FACTORY_SVNT_HAS_DLL 1 -#endif /* ! FACTORY_SVNT_HAS_DLL */ - -#if defined (FACTORY_SVNT_HAS_DLL) && (FACTORY_SVNT_HAS_DLL == 1) -# if defined (FACTORY_SVNT_BUILD_DLL) -# define FACTORY_SVNT_Export ACE_Proper_Export_Flag -# define FACTORY_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define FACTORY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* FACTORY_SVNT_BUILD_DLL */ -# define FACTORY_SVNT_Export ACE_Proper_Import_Flag -# define FACTORY_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define FACTORY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* FACTORY_SVNT_BUILD_DLL */ -#else /* FACTORY_SVNT_HAS_DLL == 1 */ -# define FACTORY_SVNT_Export -# define FACTORY_SVNT_SINGLETON_DECLARATION(T) -# define FACTORY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* FACTORY_SVNT_HAS_DLL == 1 */ - -// Set FACTORY_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (FACTORY_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define FACTORY_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define FACTORY_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !FACTORY_SVNT_NTRACE */ - -#if (FACTORY_SVNT_NTRACE == 1) -# define FACTORY_SVNT_TRACE(X) -#else /* (FACTORY_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define FACTORY_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (FACTORY_SVNT_NTRACE == 1) */ - -#endif /* FACTORY_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/CIAO/tests/IDL3/Homes/Finder/Finder.mpc index ce99a021e6f..f4b34569e6c 100644 --- a/CIAO/tests/IDL3/Homes/Finder/Finder.mpc +++ b/CIAO/tests/IDL3/Homes/Finder/Finder.mpc @@ -4,7 +4,7 @@ project(Finder_stub): ccm_stub { sharedname = Finder_stub - idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h + idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h -Gxhst -Gxhsk dynamicflags = FINDER_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h b/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h deleted file mode 100644 index 4d9cd68fe15..00000000000 --- a/CIAO/tests/IDL3/Homes/Finder/Finder_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 FINDER_STUB -// ------------------------------ -#ifndef FINDER_STUB_EXPORT_H -#define FINDER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (FINDER_STUB_HAS_DLL) -# define FINDER_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && FINDER_STUB_HAS_DLL */ - -#if !defined (FINDER_STUB_HAS_DLL) -# define FINDER_STUB_HAS_DLL 1 -#endif /* ! FINDER_STUB_HAS_DLL */ - -#if defined (FINDER_STUB_HAS_DLL) && (FINDER_STUB_HAS_DLL == 1) -# if defined (FINDER_STUB_BUILD_DLL) -# define FINDER_STUB_Export ACE_Proper_Export_Flag -# define FINDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define FINDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* FINDER_STUB_BUILD_DLL */ -# define FINDER_STUB_Export ACE_Proper_Import_Flag -# define FINDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define FINDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* FINDER_STUB_BUILD_DLL */ -#else /* FINDER_STUB_HAS_DLL == 1 */ -# define FINDER_STUB_Export -# define FINDER_STUB_SINGLETON_DECLARATION(T) -# define FINDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* FINDER_STUB_HAS_DLL == 1 */ - -// Set FINDER_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (FINDER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define FINDER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define FINDER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !FINDER_STUB_NTRACE */ - -#if (FINDER_STUB_NTRACE == 1) -# define FINDER_STUB_TRACE(X) -#else /* (FINDER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define FINDER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (FINDER_STUB_NTRACE == 1) */ - -#endif /* FINDER_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h b/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h deleted file mode 100644 index 87a52c9df52..00000000000 --- a/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_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 FINDER_SVNT -// ------------------------------ -#ifndef FINDER_SVNT_EXPORT_H -#define FINDER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (FINDER_SVNT_HAS_DLL) -# define FINDER_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && FINDER_SVNT_HAS_DLL */ - -#if !defined (FINDER_SVNT_HAS_DLL) -# define FINDER_SVNT_HAS_DLL 1 -#endif /* ! FINDER_SVNT_HAS_DLL */ - -#if defined (FINDER_SVNT_HAS_DLL) && (FINDER_SVNT_HAS_DLL == 1) -# if defined (FINDER_SVNT_BUILD_DLL) -# define FINDER_SVNT_Export ACE_Proper_Export_Flag -# define FINDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define FINDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* FINDER_SVNT_BUILD_DLL */ -# define FINDER_SVNT_Export ACE_Proper_Import_Flag -# define FINDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define FINDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* FINDER_SVNT_BUILD_DLL */ -#else /* FINDER_SVNT_HAS_DLL == 1 */ -# define FINDER_SVNT_Export -# define FINDER_SVNT_SINGLETON_DECLARATION(T) -# define FINDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* FINDER_SVNT_HAS_DLL == 1 */ - -// Set FINDER_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (FINDER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define FINDER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define FINDER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !FINDER_SVNT_NTRACE */ - -#if (FINDER_SVNT_NTRACE == 1) -# define FINDER_SVNT_TRACE(X) -#else /* (FINDER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define FINDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (FINDER_SVNT_NTRACE == 1) */ - -#endif /* FINDER_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc index cd467329b2c..a75a3ec597d 100644 --- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc +++ b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc @@ -4,7 +4,7 @@ project(Inheritance_stub): ccm_stub { sharedname = Inheritance_stub - idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h + idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h -Gxhst -Gxhsk dynamicflags = INHERITANCE_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h deleted file mode 100644 index 8850bb78150..00000000000 --- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_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 INHERITANCE_STUB -// ------------------------------ -#ifndef INHERITANCE_STUB_EXPORT_H -#define INHERITANCE_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (INHERITANCE_STUB_HAS_DLL) -# define INHERITANCE_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && INHERITANCE_STUB_HAS_DLL */ - -#if !defined (INHERITANCE_STUB_HAS_DLL) -# define INHERITANCE_STUB_HAS_DLL 1 -#endif /* ! INHERITANCE_STUB_HAS_DLL */ - -#if defined (INHERITANCE_STUB_HAS_DLL) && (INHERITANCE_STUB_HAS_DLL == 1) -# if defined (INHERITANCE_STUB_BUILD_DLL) -# define INHERITANCE_STUB_Export ACE_Proper_Export_Flag -# define INHERITANCE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define INHERITANCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* INHERITANCE_STUB_BUILD_DLL */ -# define INHERITANCE_STUB_Export ACE_Proper_Import_Flag -# define INHERITANCE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define INHERITANCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* INHERITANCE_STUB_BUILD_DLL */ -#else /* INHERITANCE_STUB_HAS_DLL == 1 */ -# define INHERITANCE_STUB_Export -# define INHERITANCE_STUB_SINGLETON_DECLARATION(T) -# define INHERITANCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* INHERITANCE_STUB_HAS_DLL == 1 */ - -// Set INHERITANCE_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (INHERITANCE_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define INHERITANCE_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define INHERITANCE_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !INHERITANCE_STUB_NTRACE */ - -#if (INHERITANCE_STUB_NTRACE == 1) -# define INHERITANCE_STUB_TRACE(X) -#else /* (INHERITANCE_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define INHERITANCE_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (INHERITANCE_STUB_NTRACE == 1) */ - -#endif /* INHERITANCE_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h deleted file mode 100644 index 083c201538a..00000000000 --- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_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 INHERITANCE_SVNT -// ------------------------------ -#ifndef INHERITANCE_SVNT_EXPORT_H -#define INHERITANCE_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (INHERITANCE_SVNT_HAS_DLL) -# define INHERITANCE_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && INHERITANCE_SVNT_HAS_DLL */ - -#if !defined (INHERITANCE_SVNT_HAS_DLL) -# define INHERITANCE_SVNT_HAS_DLL 1 -#endif /* ! INHERITANCE_SVNT_HAS_DLL */ - -#if defined (INHERITANCE_SVNT_HAS_DLL) && (INHERITANCE_SVNT_HAS_DLL == 1) -# if defined (INHERITANCE_SVNT_BUILD_DLL) -# define INHERITANCE_SVNT_Export ACE_Proper_Export_Flag -# define INHERITANCE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define INHERITANCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* INHERITANCE_SVNT_BUILD_DLL */ -# define INHERITANCE_SVNT_Export ACE_Proper_Import_Flag -# define INHERITANCE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define INHERITANCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* INHERITANCE_SVNT_BUILD_DLL */ -#else /* INHERITANCE_SVNT_HAS_DLL == 1 */ -# define INHERITANCE_SVNT_Export -# define INHERITANCE_SVNT_SINGLETON_DECLARATION(T) -# define INHERITANCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* INHERITANCE_SVNT_HAS_DLL == 1 */ - -// Set INHERITANCE_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (INHERITANCE_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define INHERITANCE_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define INHERITANCE_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !INHERITANCE_SVNT_NTRACE */ - -#if (INHERITANCE_SVNT_NTRACE == 1) -# define INHERITANCE_SVNT_TRACE(X) -#else /* (INHERITANCE_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define INHERITANCE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (INHERITANCE_SVNT_NTRACE == 1) */ - -#endif /* INHERITANCE_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc index 854538563d0..d099c2853bf 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc @@ -4,7 +4,7 @@ project(ICBasic_stub): ccm_stub { sharedname = ICBasic_stub - idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h + idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h -Gxhst -Gxhsk dynamicflags = ICBASIC_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h deleted file mode 100644 index b58cac3acfc..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_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 ICBASIC_STUB -// ------------------------------ -#ifndef ICBASIC_STUB_EXPORT_H -#define ICBASIC_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICBASIC_STUB_HAS_DLL) -# define ICBASIC_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICBASIC_STUB_HAS_DLL */ - -#if !defined (ICBASIC_STUB_HAS_DLL) -# define ICBASIC_STUB_HAS_DLL 1 -#endif /* ! ICBASIC_STUB_HAS_DLL */ - -#if defined (ICBASIC_STUB_HAS_DLL) && (ICBASIC_STUB_HAS_DLL == 1) -# if defined (ICBASIC_STUB_BUILD_DLL) -# define ICBASIC_STUB_Export ACE_Proper_Export_Flag -# define ICBASIC_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICBASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICBASIC_STUB_BUILD_DLL */ -# define ICBASIC_STUB_Export ACE_Proper_Import_Flag -# define ICBASIC_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICBASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICBASIC_STUB_BUILD_DLL */ -#else /* ICBASIC_STUB_HAS_DLL == 1 */ -# define ICBASIC_STUB_Export -# define ICBASIC_STUB_SINGLETON_DECLARATION(T) -# define ICBASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICBASIC_STUB_HAS_DLL == 1 */ - -// Set ICBASIC_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICBASIC_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ICBASIC_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICBASIC_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICBASIC_STUB_NTRACE */ - -#if (ICBASIC_STUB_NTRACE == 1) -# define ICBASIC_STUB_TRACE(X) -#else /* (ICBASIC_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICBASIC_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICBASIC_STUB_NTRACE == 1) */ - -#endif /* ICBASIC_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h deleted file mode 100644 index de3714a6c75..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_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 ICBASIC_SVNT -// ------------------------------ -#ifndef ICBASIC_SVNT_EXPORT_H -#define ICBASIC_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICBASIC_SVNT_HAS_DLL) -# define ICBASIC_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICBASIC_SVNT_HAS_DLL */ - -#if !defined (ICBASIC_SVNT_HAS_DLL) -# define ICBASIC_SVNT_HAS_DLL 1 -#endif /* ! ICBASIC_SVNT_HAS_DLL */ - -#if defined (ICBASIC_SVNT_HAS_DLL) && (ICBASIC_SVNT_HAS_DLL == 1) -# if defined (ICBASIC_SVNT_BUILD_DLL) -# define ICBASIC_SVNT_Export ACE_Proper_Export_Flag -# define ICBASIC_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICBASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICBASIC_SVNT_BUILD_DLL */ -# define ICBASIC_SVNT_Export ACE_Proper_Import_Flag -# define ICBASIC_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICBASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICBASIC_SVNT_BUILD_DLL */ -#else /* ICBASIC_SVNT_HAS_DLL == 1 */ -# define ICBASIC_SVNT_Export -# define ICBASIC_SVNT_SINGLETON_DECLARATION(T) -# define ICBASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICBASIC_SVNT_HAS_DLL == 1 */ - -// Set ICBASIC_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICBASIC_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ICBASIC_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICBASIC_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICBASIC_SVNT_NTRACE */ - -#if (ICBASIC_SVNT_NTRACE == 1) -# define ICBASIC_SVNT_TRACE(X) -#else /* (ICBASIC_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICBASIC_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICBASIC_SVNT_NTRACE == 1) */ - -#endif /* ICBASIC_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc index e9381d014b2..38f6e70a2dc 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc @@ -4,7 +4,7 @@ project(ICEventSink_stub): ccm_stub { sharedname = ICEventSink_stub - idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h + idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h -Gxhst -Gxhsk dynamicflags = ICEVENTSINK_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h deleted file mode 100644 index c773bbcf313..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_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 ICEVENTSINK_STUB -// ------------------------------ -#ifndef ICEVENTSINK_STUB_EXPORT_H -#define ICEVENTSINK_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSINK_STUB_HAS_DLL) -# define ICEVENTSINK_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICEVENTSINK_STUB_HAS_DLL */ - -#if !defined (ICEVENTSINK_STUB_HAS_DLL) -# define ICEVENTSINK_STUB_HAS_DLL 1 -#endif /* ! ICEVENTSINK_STUB_HAS_DLL */ - -#if defined (ICEVENTSINK_STUB_HAS_DLL) && (ICEVENTSINK_STUB_HAS_DLL == 1) -# if defined (ICEVENTSINK_STUB_BUILD_DLL) -# define ICEVENTSINK_STUB_Export ACE_Proper_Export_Flag -# define ICEVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICEVENTSINK_STUB_BUILD_DLL */ -# define ICEVENTSINK_STUB_Export ACE_Proper_Import_Flag -# define ICEVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICEVENTSINK_STUB_BUILD_DLL */ -#else /* ICEVENTSINK_STUB_HAS_DLL == 1 */ -# define ICEVENTSINK_STUB_Export -# define ICEVENTSINK_STUB_SINGLETON_DECLARATION(T) -# define ICEVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICEVENTSINK_STUB_HAS_DLL == 1 */ - -// Set ICEVENTSINK_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICEVENTSINK_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ICEVENTSINK_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICEVENTSINK_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICEVENTSINK_STUB_NTRACE */ - -#if (ICEVENTSINK_STUB_NTRACE == 1) -# define ICEVENTSINK_STUB_TRACE(X) -#else /* (ICEVENTSINK_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICEVENTSINK_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICEVENTSINK_STUB_NTRACE == 1) */ - -#endif /* ICEVENTSINK_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h deleted file mode 100644 index 10eed510dea..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_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 ICEVENTSINK_SVNT -// ------------------------------ -#ifndef ICEVENTSINK_SVNT_EXPORT_H -#define ICEVENTSINK_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSINK_SVNT_HAS_DLL) -# define ICEVENTSINK_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICEVENTSINK_SVNT_HAS_DLL */ - -#if !defined (ICEVENTSINK_SVNT_HAS_DLL) -# define ICEVENTSINK_SVNT_HAS_DLL 1 -#endif /* ! ICEVENTSINK_SVNT_HAS_DLL */ - -#if defined (ICEVENTSINK_SVNT_HAS_DLL) && (ICEVENTSINK_SVNT_HAS_DLL == 1) -# if defined (ICEVENTSINK_SVNT_BUILD_DLL) -# define ICEVENTSINK_SVNT_Export ACE_Proper_Export_Flag -# define ICEVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICEVENTSINK_SVNT_BUILD_DLL */ -# define ICEVENTSINK_SVNT_Export ACE_Proper_Import_Flag -# define ICEVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICEVENTSINK_SVNT_BUILD_DLL */ -#else /* ICEVENTSINK_SVNT_HAS_DLL == 1 */ -# define ICEVENTSINK_SVNT_Export -# define ICEVENTSINK_SVNT_SINGLETON_DECLARATION(T) -# define ICEVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICEVENTSINK_SVNT_HAS_DLL == 1 */ - -// Set ICEVENTSINK_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICEVENTSINK_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ICEVENTSINK_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICEVENTSINK_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICEVENTSINK_SVNT_NTRACE */ - -#if (ICEVENTSINK_SVNT_NTRACE == 1) -# define ICEVENTSINK_SVNT_TRACE(X) -#else /* (ICEVENTSINK_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICEVENTSINK_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICEVENTSINK_SVNT_NTRACE == 1) */ - -#endif /* ICEVENTSINK_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc index 123083e4d3f..694ee7ea3da 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc @@ -4,7 +4,7 @@ project(ICEventSource_stub): ccm_stub { sharedname = ICEventSource_stub - idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h + idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h -Gxhst -Gxhsk dynamicflags = ICEVENTSOURCE_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h deleted file mode 100644 index f28d2ba2d3a..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_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 ICEVENTSOURCE_STUB -// ------------------------------ -#ifndef ICEVENTSOURCE_STUB_EXPORT_H -#define ICEVENTSOURCE_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSOURCE_STUB_HAS_DLL) -# define ICEVENTSOURCE_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICEVENTSOURCE_STUB_HAS_DLL */ - -#if !defined (ICEVENTSOURCE_STUB_HAS_DLL) -# define ICEVENTSOURCE_STUB_HAS_DLL 1 -#endif /* ! ICEVENTSOURCE_STUB_HAS_DLL */ - -#if defined (ICEVENTSOURCE_STUB_HAS_DLL) && (ICEVENTSOURCE_STUB_HAS_DLL == 1) -# if defined (ICEVENTSOURCE_STUB_BUILD_DLL) -# define ICEVENTSOURCE_STUB_Export ACE_Proper_Export_Flag -# define ICEVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICEVENTSOURCE_STUB_BUILD_DLL */ -# define ICEVENTSOURCE_STUB_Export ACE_Proper_Import_Flag -# define ICEVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICEVENTSOURCE_STUB_BUILD_DLL */ -#else /* ICEVENTSOURCE_STUB_HAS_DLL == 1 */ -# define ICEVENTSOURCE_STUB_Export -# define ICEVENTSOURCE_STUB_SINGLETON_DECLARATION(T) -# define ICEVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICEVENTSOURCE_STUB_HAS_DLL == 1 */ - -// Set ICEVENTSOURCE_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICEVENTSOURCE_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ICEVENTSOURCE_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICEVENTSOURCE_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICEVENTSOURCE_STUB_NTRACE */ - -#if (ICEVENTSOURCE_STUB_NTRACE == 1) -# define ICEVENTSOURCE_STUB_TRACE(X) -#else /* (ICEVENTSOURCE_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICEVENTSOURCE_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICEVENTSOURCE_STUB_NTRACE == 1) */ - -#endif /* ICEVENTSOURCE_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h deleted file mode 100644 index b7269a38b47..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_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 ICEVENTSOURCE_SVNT -// ------------------------------ -#ifndef ICEVENTSOURCE_SVNT_EXPORT_H -#define ICEVENTSOURCE_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSOURCE_SVNT_HAS_DLL) -# define ICEVENTSOURCE_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICEVENTSOURCE_SVNT_HAS_DLL */ - -#if !defined (ICEVENTSOURCE_SVNT_HAS_DLL) -# define ICEVENTSOURCE_SVNT_HAS_DLL 1 -#endif /* ! ICEVENTSOURCE_SVNT_HAS_DLL */ - -#if defined (ICEVENTSOURCE_SVNT_HAS_DLL) && (ICEVENTSOURCE_SVNT_HAS_DLL == 1) -# if defined (ICEVENTSOURCE_SVNT_BUILD_DLL) -# define ICEVENTSOURCE_SVNT_Export ACE_Proper_Export_Flag -# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICEVENTSOURCE_SVNT_BUILD_DLL */ -# define ICEVENTSOURCE_SVNT_Export ACE_Proper_Import_Flag -# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICEVENTSOURCE_SVNT_BUILD_DLL */ -#else /* ICEVENTSOURCE_SVNT_HAS_DLL == 1 */ -# define ICEVENTSOURCE_SVNT_Export -# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) -# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICEVENTSOURCE_SVNT_HAS_DLL == 1 */ - -// Set ICEVENTSOURCE_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICEVENTSOURCE_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ICEVENTSOURCE_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICEVENTSOURCE_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICEVENTSOURCE_SVNT_NTRACE */ - -#if (ICEVENTSOURCE_SVNT_NTRACE == 1) -# define ICEVENTSOURCE_SVNT_TRACE(X) -#else /* (ICEVENTSOURCE_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICEVENTSOURCE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICEVENTSOURCE_SVNT_NTRACE == 1) */ - -#endif /* ICEVENTSOURCE_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc index cc1f610892c..4401a63c4a4 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc @@ -4,7 +4,7 @@ project(ICReceptacles_stub): ccm_stub { sharedname = ICReceptacles_stub - idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h + idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h -Gxhst -Gxhsk dynamicflags = ICRECEPTACLES_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h deleted file mode 100644 index 2571741be01..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_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 ICRECEPTACLES_STUB -// ------------------------------ -#ifndef ICRECEPTACLES_STUB_EXPORT_H -#define ICRECEPTACLES_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICRECEPTACLES_STUB_HAS_DLL) -# define ICRECEPTACLES_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICRECEPTACLES_STUB_HAS_DLL */ - -#if !defined (ICRECEPTACLES_STUB_HAS_DLL) -# define ICRECEPTACLES_STUB_HAS_DLL 1 -#endif /* ! ICRECEPTACLES_STUB_HAS_DLL */ - -#if defined (ICRECEPTACLES_STUB_HAS_DLL) && (ICRECEPTACLES_STUB_HAS_DLL == 1) -# if defined (ICRECEPTACLES_STUB_BUILD_DLL) -# define ICRECEPTACLES_STUB_Export ACE_Proper_Export_Flag -# define ICRECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICRECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICRECEPTACLES_STUB_BUILD_DLL */ -# define ICRECEPTACLES_STUB_Export ACE_Proper_Import_Flag -# define ICRECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICRECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICRECEPTACLES_STUB_BUILD_DLL */ -#else /* ICRECEPTACLES_STUB_HAS_DLL == 1 */ -# define ICRECEPTACLES_STUB_Export -# define ICRECEPTACLES_STUB_SINGLETON_DECLARATION(T) -# define ICRECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICRECEPTACLES_STUB_HAS_DLL == 1 */ - -// Set ICRECEPTACLES_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICRECEPTACLES_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ICRECEPTACLES_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICRECEPTACLES_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICRECEPTACLES_STUB_NTRACE */ - -#if (ICRECEPTACLES_STUB_NTRACE == 1) -# define ICRECEPTACLES_STUB_TRACE(X) -#else /* (ICRECEPTACLES_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICRECEPTACLES_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICRECEPTACLES_STUB_NTRACE == 1) */ - -#endif /* ICRECEPTACLES_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h deleted file mode 100644 index d826479eeaa..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_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 ICRECEPTACLES_SVNT -// ------------------------------ -#ifndef ICRECEPTACLES_SVNT_EXPORT_H -#define ICRECEPTACLES_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ICRECEPTACLES_SVNT_HAS_DLL) -# define ICRECEPTACLES_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ICRECEPTACLES_SVNT_HAS_DLL */ - -#if !defined (ICRECEPTACLES_SVNT_HAS_DLL) -# define ICRECEPTACLES_SVNT_HAS_DLL 1 -#endif /* ! ICRECEPTACLES_SVNT_HAS_DLL */ - -#if defined (ICRECEPTACLES_SVNT_HAS_DLL) && (ICRECEPTACLES_SVNT_HAS_DLL == 1) -# if defined (ICRECEPTACLES_SVNT_BUILD_DLL) -# define ICRECEPTACLES_SVNT_Export ACE_Proper_Export_Flag -# define ICRECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ICRECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ICRECEPTACLES_SVNT_BUILD_DLL */ -# define ICRECEPTACLES_SVNT_Export ACE_Proper_Import_Flag -# define ICRECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ICRECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ICRECEPTACLES_SVNT_BUILD_DLL */ -#else /* ICRECEPTACLES_SVNT_HAS_DLL == 1 */ -# define ICRECEPTACLES_SVNT_Export -# define ICRECEPTACLES_SVNT_SINGLETON_DECLARATION(T) -# define ICRECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ICRECEPTACLES_SVNT_HAS_DLL == 1 */ - -// Set ICRECEPTACLES_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ICRECEPTACLES_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ICRECEPTACLES_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ICRECEPTACLES_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ICRECEPTACLES_SVNT_NTRACE */ - -#if (ICRECEPTACLES_SVNT_NTRACE == 1) -# define ICRECEPTACLES_SVNT_TRACE(X) -#else /* (ICRECEPTACLES_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ICRECEPTACLES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ICRECEPTACLES_SVNT_NTRACE == 1) */ - -#endif /* ICRECEPTACLES_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc index 4200e384e0a..13258d18145 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc @@ -4,7 +4,7 @@ project(Events_stub): ccm_stub { sharedname = Events_stub - idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h + idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h -Gxhst -Gxhsk dynamicflags = EVENTS_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h deleted file mode 100644 index be696db1402..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_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 EVENTS_STUB -// ------------------------------ -#ifndef EVENTS_STUB_EXPORT_H -#define EVENTS_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTS_STUB_HAS_DLL) -# define EVENTS_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && EVENTS_STUB_HAS_DLL */ - -#if !defined (EVENTS_STUB_HAS_DLL) -# define EVENTS_STUB_HAS_DLL 1 -#endif /* ! EVENTS_STUB_HAS_DLL */ - -#if defined (EVENTS_STUB_HAS_DLL) && (EVENTS_STUB_HAS_DLL == 1) -# if defined (EVENTS_STUB_BUILD_DLL) -# define EVENTS_STUB_Export ACE_Proper_Export_Flag -# define EVENTS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EVENTS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EVENTS_STUB_BUILD_DLL */ -# define EVENTS_STUB_Export ACE_Proper_Import_Flag -# define EVENTS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EVENTS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EVENTS_STUB_BUILD_DLL */ -#else /* EVENTS_STUB_HAS_DLL == 1 */ -# define EVENTS_STUB_Export -# define EVENTS_STUB_SINGLETON_DECLARATION(T) -# define EVENTS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EVENTS_STUB_HAS_DLL == 1 */ - -// Set EVENTS_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EVENTS_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define EVENTS_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EVENTS_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EVENTS_STUB_NTRACE */ - -#if (EVENTS_STUB_NTRACE == 1) -# define EVENTS_STUB_TRACE(X) -#else /* (EVENTS_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EVENTS_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EVENTS_STUB_NTRACE == 1) */ - -#endif /* EVENTS_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h deleted file mode 100644 index bca88a9a54a..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_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 EVENTS_SVNT -// ------------------------------ -#ifndef EVENTS_SVNT_EXPORT_H -#define EVENTS_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTS_SVNT_HAS_DLL) -# define EVENTS_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && EVENTS_SVNT_HAS_DLL */ - -#if !defined (EVENTS_SVNT_HAS_DLL) -# define EVENTS_SVNT_HAS_DLL 1 -#endif /* ! EVENTS_SVNT_HAS_DLL */ - -#if defined (EVENTS_SVNT_HAS_DLL) && (EVENTS_SVNT_HAS_DLL == 1) -# if defined (EVENTS_SVNT_BUILD_DLL) -# define EVENTS_SVNT_Export ACE_Proper_Export_Flag -# define EVENTS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EVENTS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EVENTS_SVNT_BUILD_DLL */ -# define EVENTS_SVNT_Export ACE_Proper_Import_Flag -# define EVENTS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EVENTS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EVENTS_SVNT_BUILD_DLL */ -#else /* EVENTS_SVNT_HAS_DLL == 1 */ -# define EVENTS_SVNT_Export -# define EVENTS_SVNT_SINGLETON_DECLARATION(T) -# define EVENTS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EVENTS_SVNT_HAS_DLL == 1 */ - -// Set EVENTS_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EVENTS_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define EVENTS_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EVENTS_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EVENTS_SVNT_NTRACE */ - -#if (EVENTS_SVNT_NTRACE == 1) -# define EVENTS_SVNT_TRACE(X) -#else /* (EVENTS_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EVENTS_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EVENTS_SVNT_NTRACE == 1) */ - -#endif /* EVENTS_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc index bb6b96ca281..81a60296b7d 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc @@ -4,7 +4,7 @@ project(Homes_stub): ccm_stub { sharedname = Homes_stub - idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h + idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h -Gxhst -Gxhsk dynamicflags = HOMES_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h deleted file mode 100644 index e7ba466797c..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_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 HOMES_STUB -// ------------------------------ -#ifndef HOMES_STUB_EXPORT_H -#define HOMES_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMES_STUB_HAS_DLL) -# define HOMES_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && HOMES_STUB_HAS_DLL */ - -#if !defined (HOMES_STUB_HAS_DLL) -# define HOMES_STUB_HAS_DLL 1 -#endif /* ! HOMES_STUB_HAS_DLL */ - -#if defined (HOMES_STUB_HAS_DLL) && (HOMES_STUB_HAS_DLL == 1) -# if defined (HOMES_STUB_BUILD_DLL) -# define HOMES_STUB_Export ACE_Proper_Export_Flag -# define HOMES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HOMES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HOMES_STUB_BUILD_DLL */ -# define HOMES_STUB_Export ACE_Proper_Import_Flag -# define HOMES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HOMES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HOMES_STUB_BUILD_DLL */ -#else /* HOMES_STUB_HAS_DLL == 1 */ -# define HOMES_STUB_Export -# define HOMES_STUB_SINGLETON_DECLARATION(T) -# define HOMES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HOMES_STUB_HAS_DLL == 1 */ - -// Set HOMES_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HOMES_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define HOMES_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HOMES_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HOMES_STUB_NTRACE */ - -#if (HOMES_STUB_NTRACE == 1) -# define HOMES_STUB_TRACE(X) -#else /* (HOMES_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HOMES_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HOMES_STUB_NTRACE == 1) */ - -#endif /* HOMES_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h deleted file mode 100644 index 16fc4127d94..00000000000 --- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_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 HOMES_SVNT -// ------------------------------ -#ifndef HOMES_SVNT_EXPORT_H -#define HOMES_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMES_SVNT_HAS_DLL) -# define HOMES_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && HOMES_SVNT_HAS_DLL */ - -#if !defined (HOMES_SVNT_HAS_DLL) -# define HOMES_SVNT_HAS_DLL 1 -#endif /* ! HOMES_SVNT_HAS_DLL */ - -#if defined (HOMES_SVNT_HAS_DLL) && (HOMES_SVNT_HAS_DLL == 1) -# if defined (HOMES_SVNT_BUILD_DLL) -# define HOMES_SVNT_Export ACE_Proper_Export_Flag -# define HOMES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HOMES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HOMES_SVNT_BUILD_DLL */ -# define HOMES_SVNT_Export ACE_Proper_Import_Flag -# define HOMES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HOMES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HOMES_SVNT_BUILD_DLL */ -#else /* HOMES_SVNT_HAS_DLL == 1 */ -# define HOMES_SVNT_Export -# define HOMES_SVNT_SINGLETON_DECLARATION(T) -# define HOMES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HOMES_SVNT_HAS_DLL == 1 */ - -// Set HOMES_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HOMES_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define HOMES_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HOMES_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HOMES_SVNT_NTRACE */ - -#if (HOMES_SVNT_NTRACE == 1) -# define HOMES_SVNT_TRACE(X) -#else /* (HOMES_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HOMES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HOMES_SVNT_NTRACE == 1) */ - -#endif /* HOMES_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc index 4b88561e5fe..177f178c2bc 100644 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc @@ -53,7 +53,7 @@ project(Inherited_Components_lem_stub) : ccm_svnt, dds4ccm_base { project(Inherited_Components_stub) : ccm_stub, dds4ccm_base { after += Inherited_Components_idl_gen - libs += + libs += sharedname = ComponentC_stub dynamicflags = INHERITED_COMPONENTS_STUB_BUILD_DLL diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl new file mode 100644 index 00000000000..457e3db2578 --- /dev/null +++ b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl @@ -0,0 +1,12 @@ +// $Id$ +#include <Components.idl> + +local interface Foo +{ +}; + +component Bar +{ + uses Foo foo_in; + provides Foo foo_out; +}; diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc new file mode 100644 index 00000000000..85965e43430 --- /dev/null +++ b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc @@ -0,0 +1,138 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl Local_Facet" + +project(Local_Facet_idl_gen) : componentidldefaults { + requires += dummy_label + custom_only = 1 + idlflags += -Wb,stub_export_macro=LOCAL_FACET_STUB_Export \ + -Wb,stub_export_include=Local_Facet_stub_export.h \ + -Wb,skel_export_macro=LOCAL_FACET_SVNT_Export \ + -Wb,skel_export_include=Local_Facet_svnt_export.h \ + -Wb,exec_export_macro=LOCAL_FACET_EXEC_Export \ + -Wb,exec_export_include=Local_Facet_exec_export.h + + IDL_Files { + Local_Facet.idl + } +} + +project(Local_Facet_lem_gen) : ciaoidldefaults { + requires += dummy_label + after += Local_Facet_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=LOCAL_FACET_LEM_STUB_Export \ + -Wb,stub_export_include=Local_Facet_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + Local_FacetE.idl + } +} + +project(Local_Facet_lem_stub) : ccm_svnt { + requires += dummy_label + after += Local_Facet_lem_gen Local_Facet_stub + libs += Local_Facet_stub + + + sharedname = Local_Facet_lem_stub + dynamicflags = LOCAL_FACET_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_FacetEC.cpp + } + + Header_Files { + Local_FacetEC.h + Local_Facet_lem_stub_export.h + } + + Inline_Files { + Local_FacetEC.inl + } +} + +project(Local_Facet_stub) : ccm_stub { + requires += dummy_label + after += Local_Facet_idl_gen + libs += + + + sharedname = Local_Facet_stub + dynamicflags = LOCAL_FACET_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_FacetC.cpp + } + + Header_Files { + Local_FacetC.h + Local_Facet_stub_export.h + } + + Inline_Files { + Local_FacetC.inl + } +} + +project(Local_Facet_exec) : ciao_executor { + requires += dummy_label + after += Local_Facet_lem_stub Local_Facet_stub + sharedname = Local_Facet_exec + libs += Local_Facet_stub Local_Facet_lem_stub + + + dynamicflags = LOCAL_FACET_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_Facet_exec.cpp + } + + Header_Files { + Local_Facet_exec.h + Local_Facet_exec_export.h + } + + Inline_Files { + } +} + + +project(Local_Facet_svnt) : ciao_servant { + requires += dummy_label + after += Local_Facet_lem_stub + sharedname = Local_Facet_svnt + libs += Local_Facet_stub Local_Facet_lem_stub + + + dynamicflags = LOCAL_FACET_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_FacetS.cpp + Local_Facet_svnt.cpp + } + + Header_Files { + Local_FacetS.h + Local_Facet_svnt.h + Local_Facet_svnt_export.h + } + + Inline_Files { + Local_FacetS.inl + } +} + + diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp new file mode 100644 index 00000000000..3f76738685f --- /dev/null +++ b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp @@ -0,0 +1,125 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 + * 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 + **/ + +// TAO_IDL - Generated from +// be/be_codegen.cpp:1278 + +#include "Local_Facet_exec.h" + +namespace CIAO_Bar_Impl +{ + //============================================================ + // Facet Executor Implementation Class: Foo_exec_i + //============================================================ + + Foo_exec_i::Foo_exec_i (void) + { + } + + Foo_exec_i::~Foo_exec_i (void) + { + } + + // Operations from ::Foo + + //============================================================ + // Component Executor Implementation Class: Bar_exec_i + //============================================================ + + Bar_exec_i::Bar_exec_i (void) + { + } + + Bar_exec_i::~Bar_exec_i (void) + { + } + + // Supported operations and attributes. + + // Component attributes and port operations. + + ::CCM_Foo_ptr + Bar_exec_i::get_foo_out (void) + { + /* Your code here. */ + return ::CCM_Foo::_nil (); + } + + // Operations from Components::SessionComponent. + + void + Bar_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = + ::CCM_Bar_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Bar_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Bar_exec_i::ccm_activate (void) + { + /* Your code here. */ + } + + void + Bar_exec_i::ccm_passivate (void) + { + /* Your code here. */ + } + + void + Bar_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" LOCAL_FACET_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Bar_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Bar_exec_i); + + return retval; + } +} + diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h new file mode 100644 index 00000000000..d91b1e991b1 --- /dev/null +++ b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h @@ -0,0 +1,107 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 + * 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 + **/ + +// TAO_IDL - Generated from +// be/be_codegen.cpp:1217 + +#ifndef CIAO_LOCAL_FACET_EXEC_H_ +#define CIAO_LOCAL_FACET_EXEC_H_ + +#include /**/ "ace/pre.h" + +#include "Local_FacetEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Local_Facet_exec_export.h" +#include "tao/LocalObject.h" + + +namespace CIAO_Bar_Impl +{ + class LOCAL_FACET_EXEC_Export Foo_exec_i + : public virtual ::CCM_Foo, + public virtual ::CORBA::LocalObject + { + public: + Foo_exec_i (void); + virtual ~Foo_exec_i (void); + + // Operations and attributes from ::Foo + }; + + class LOCAL_FACET_EXEC_Export Bar_exec_i + : public virtual Bar_Exec, + public virtual ::CORBA::LocalObject + { + public: + Bar_exec_i (void); + virtual ~Bar_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + + virtual ::CCM_Foo_ptr + get_foo_out (void); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + + virtual void + set_session_context ( + ::Components::SessionContext_ptr ctx); + + virtual void configuration_complete (void); + + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + + private: + ::CCM_Bar_Context_var context_; + }; + + extern "C" LOCAL_FACET_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Bar_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc index afa77118760..75d5225a022 100644 --- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc +++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc @@ -6,7 +6,7 @@ project(Minimum_Base_idl_gen) : ciaoidldefaults, anytypecode, ccm { idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ -Wb,stub_export_include=Minimum_Base_stub_export.h \ -Wb,skel_export_macro=MINIMUM_BASE_SKEL_Export \ - -Wb,skel_export_include=Minimum_Base_skel_export.h + -Wb,skel_export_include=Minimum_Base_skel_export.h -Gxhst -Gxhsk IDL_Files { Minimum_Base.idl diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_skel_export.h b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_skel_export.h deleted file mode 100644 index 48d7cd0979b..00000000000 --- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_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 MINIMUM_BASE_SVNT -// ------------------------------ -#ifndef MINIMUM_BASE_SKEL_EXPORT_H -#define MINIMUM_BASE_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (MINIMUM_BASE_SKEL_HAS_DLL) -# define MINIMUM_BASE_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && MINIMUM_BASE_SKEL_HAS_DLL */ - -#if !defined (MINIMUM_BASE_SKEL_HAS_DLL) -# define MINIMUM_BASE_SKEL_HAS_DLL 1 -#endif /* ! MINIMUM_BASE_SKEL_HAS_DLL */ - -#if defined (MINIMUM_BASE_SKEL_HAS_DLL) && (MINIMUM_BASE_SKEL_HAS_DLL == 1) -# if defined (MINIMUM_BASE_SKEL_BUILD_DLL) -# define MINIMUM_BASE_SKEL_Export ACE_Proper_Export_Flag -# define MINIMUM_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define MINIMUM_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* MINIMUM_BASE_SKEL_BUILD_DLL */ -# define MINIMUM_BASE_SKEL_Export ACE_Proper_Import_Flag -# define MINIMUM_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define MINIMUM_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* MINIMUM_BASE_SKEL_BUILD_DLL */ -#else /* MINIMUM_BASE_SKEL_HAS_DLL == 1 */ -# define MINIMUM_BASE_SKEL_Export -# define MINIMUM_BASE_SKEL_SINGLETON_DECLARATION(T) -# define MINIMUM_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* MINIMUM_BASE_SKEL_HAS_DLL == 1 */ - -// Set MINIMUM_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (MINIMUM_BASE_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define MINIMUM_BASE_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define MINIMUM_BASE_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !MINIMUM_BASE_SKEL_NTRACE */ - -#if (MINIMUM_BASE_SKEL_NTRACE == 1) -# define MINIMUM_BASE_SKEL_TRACE(X) -#else /* (MINIMUM_BASE_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define MINIMUM_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (MINIMUM_BASE_SKEL_NTRACE == 1) */ - -#endif /* MINIMUM_BASE_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h deleted file mode 100644 index 99c1d64369b..00000000000 --- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_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 MINIMUM_BASE_STUB -// ------------------------------ -#ifndef MINIMUM_BASE_STUB_EXPORT_H -#define MINIMUM_BASE_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (MINIMUM_BASE_STUB_HAS_DLL) -# define MINIMUM_BASE_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && MINIMUM_BASE_STUB_HAS_DLL */ - -#if !defined (MINIMUM_BASE_STUB_HAS_DLL) -# define MINIMUM_BASE_STUB_HAS_DLL 1 -#endif /* ! MINIMUM_BASE_STUB_HAS_DLL */ - -#if defined (MINIMUM_BASE_STUB_HAS_DLL) && (MINIMUM_BASE_STUB_HAS_DLL == 1) -# if defined (MINIMUM_BASE_STUB_BUILD_DLL) -# define MINIMUM_BASE_STUB_Export ACE_Proper_Export_Flag -# define MINIMUM_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define MINIMUM_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* MINIMUM_BASE_STUB_BUILD_DLL */ -# define MINIMUM_BASE_STUB_Export ACE_Proper_Import_Flag -# define MINIMUM_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define MINIMUM_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* MINIMUM_BASE_STUB_BUILD_DLL */ -#else /* MINIMUM_BASE_STUB_HAS_DLL == 1 */ -# define MINIMUM_BASE_STUB_Export -# define MINIMUM_BASE_STUB_SINGLETON_DECLARATION(T) -# define MINIMUM_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* MINIMUM_BASE_STUB_HAS_DLL == 1 */ - -// Set MINIMUM_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (MINIMUM_BASE_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define MINIMUM_BASE_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define MINIMUM_BASE_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !MINIMUM_BASE_STUB_NTRACE */ - -#if (MINIMUM_BASE_STUB_NTRACE == 1) -# define MINIMUM_BASE_STUB_TRACE(X) -#else /* (MINIMUM_BASE_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define MINIMUM_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (MINIMUM_BASE_STUB_NTRACE == 1) */ - -#endif /* MINIMUM_BASE_STUB_EXPORT_H */ - -// End of auto generated file. |