4 files changed, 3 insertions, 118 deletions

diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index f4f1a8d719f..6487187ff9b 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -3,7 +3,8 @@
 
 project(Protocols_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
+  idlflags += -Glfa \
+              -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
               -Wb,skel_export_include=Receiver_svnt_export.h \
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 9b0a3f2d6a9..6caf598e6be 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_idl_gen) : ciaoidldefaults, anytypecode {
+project(Protocols_idl_gen) : componentidldefaults, anytypecode {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
               -Wb,stub_export_include=Protocols_stub_export.h \
diff --git a/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h b/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h
deleted file mode 100644
index 2f169679d78..00000000000
--- a/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PROTOCOLS_SKEL
-// ------------------------------
-#ifndef PROTOCOLS_SKEL_EXPORT_H
-#define PROTOCOLS_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PROTOCOLS_SKEL_HAS_DLL)
-#  define PROTOCOLS_SKEL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PROTOCOLS_SKEL_HAS_DLL */
-
-#if !defined (PROTOCOLS_SKEL_HAS_DLL)
-#  define PROTOCOLS_SKEL_HAS_DLL 1
-#endif /* ! PROTOCOLS_SKEL_HAS_DLL */
-
-#if defined (PROTOCOLS_SKEL_HAS_DLL) && (PROTOCOLS_SKEL_HAS_DLL == 1)
-#  if defined (PROTOCOLS_SKEL_BUILD_DLL)
-#    define PROTOCOLS_SKEL_Export ACE_Proper_Export_Flag
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROTOCOLS_SKEL_BUILD_DLL */
-#    define PROTOCOLS_SKEL_Export ACE_Proper_Import_Flag
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROTOCOLS_SKEL_BUILD_DLL */
-#else /* PROTOCOLS_SKEL_HAS_DLL == 1 */
-#  define PROTOCOLS_SKEL_Export
-#  define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T)
-#  define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROTOCOLS_SKEL_HAS_DLL == 1 */
-
-// Set PROTOCOLS_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROTOCOLS_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROTOCOLS_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROTOCOLS_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROTOCOLS_SKEL_NTRACE */
-
-#if (PROTOCOLS_SKEL_NTRACE == 1)
-#  define PROTOCOLS_SKEL_TRACE(X)
-#else /* (PROTOCOLS_SKEL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROTOCOLS_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROTOCOLS_SKEL_NTRACE == 1) */
-
-#endif /* PROTOCOLS_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/common/Protocols_stub_export.h b/CIAO/performance-tests/Protocols/common/Protocols_stub_export.h
deleted file mode 100644
index a214c4ceda9..00000000000
--- a/CIAO/performance-tests/Protocols/common/Protocols_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PROTOCOLS_STUB
-// ------------------------------
-#ifndef PROTOCOLS_STUB_EXPORT_H
-#define PROTOCOLS_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PROTOCOLS_STUB_HAS_DLL)
-#  define PROTOCOLS_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PROTOCOLS_STUB_HAS_DLL */
-
-#if !defined (PROTOCOLS_STUB_HAS_DLL)
-#  define PROTOCOLS_STUB_HAS_DLL 1
-#endif /* ! PROTOCOLS_STUB_HAS_DLL */
-
-#if defined (PROTOCOLS_STUB_HAS_DLL) && (PROTOCOLS_STUB_HAS_DLL == 1)
-#  if defined (PROTOCOLS_STUB_BUILD_DLL)
-#    define PROTOCOLS_STUB_Export ACE_Proper_Export_Flag
-#    define PROTOCOLS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROTOCOLS_STUB_BUILD_DLL */
-#    define PROTOCOLS_STUB_Export ACE_Proper_Import_Flag
-#    define PROTOCOLS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROTOCOLS_STUB_BUILD_DLL */
-#else /* PROTOCOLS_STUB_HAS_DLL == 1 */
-#  define PROTOCOLS_STUB_Export
-#  define PROTOCOLS_STUB_SINGLETON_DECLARATION(T)
-#  define PROTOCOLS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROTOCOLS_STUB_HAS_DLL == 1 */
-
-// Set PROTOCOLS_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROTOCOLS_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROTOCOLS_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROTOCOLS_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROTOCOLS_STUB_NTRACE */
-
-#if (PROTOCOLS_STUB_NTRACE == 1)
-#  define PROTOCOLS_STUB_TRACE(X)
-#else /* (PROTOCOLS_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROTOCOLS_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROTOCOLS_STUB_NTRACE == 1) */
-
-#endif /* PROTOCOLS_STUB_EXPORT_H */
-
-// End of auto generated file.