diff options
Diffstat (limited to 'tao/CodecFactory')
| -rw-r--r-- | tao/CodecFactory/CodecFactory.cpp | 2 | ||||
| -rw-r--r-- | tao/CodecFactory/CodecFactory.h | 4 | ||||
| -rw-r--r-- | tao/CodecFactory/CodecFactory.mpc | 10 | ||||
| -rw-r--r-- | tao/CodecFactory/codecfactory_export.h | 40 |
4 files changed, 9 insertions, 47 deletions
diff --git a/tao/CodecFactory/CodecFactory.cpp b/tao/CodecFactory/CodecFactory.cpp index f1431a88da9..191192cf0ae 100644 --- a/tao/CodecFactory/CodecFactory.cpp +++ b/tao/CodecFactory/CodecFactory.cpp @@ -38,7 +38,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader, &ACE_SVC_NAME (TAO_CodecFactory_Loader), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_FACTORY_DEFINE (TAO_CodecFactory, TAO_CodecFactory_Loader) +ACE_FACTORY_DEFINE (TAO_CODECFACTORY, TAO_CodecFactory_Loader) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/CodecFactory/CodecFactory.h b/tao/CodecFactory/CodecFactory.h index 290d2455191..92e28b2b42b 100644 --- a/tao/CodecFactory/CodecFactory.h +++ b/tao/CodecFactory/CodecFactory.h @@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_CodecFactory_Export TAO_CodecFactory_Loader +class TAO_CODECFACTORY_Export TAO_CodecFactory_Loader : public TAO_Object_Loader { public: @@ -48,7 +48,7 @@ static int TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader) -ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) +ACE_FACTORY_DECLARE (TAO_CODECFACTORY, TAO_CodecFactory_Loader) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/CodecFactory/CodecFactory.mpc b/tao/CodecFactory/CodecFactory.mpc index 655dd5c29ed..cbda75b62d4 100644 --- a/tao/CodecFactory/CodecFactory.mpc +++ b/tao/CodecFactory/CodecFactory.mpc @@ -3,18 +3,19 @@ project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sal -GX \ - -Wb,export_macro=TAO_CodecFactory_Export \ - -Wb,export_include=tao/CodecFactory/codecfactory_export.h \ + -Wb,stub_export_macro=TAO_CODECFACTORY_Export \ + -Wb,stub_export_include=tao/CodecFactory/codecfactory_export.h \ + -Wb,stub_export_file=codecfactory_export.h \ -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE \ -Wb,safe_include=tao/CodecFactory/CodecFactory.h \ - -iC tao/CodecFactory + -iC tao/CodecFactory -Gxhst idlflags -= -Sa -St IOP_Codec.pidl } IDL_Files { idlflags += -Sci -SS -Sorb -Sa -GX \ - -Wb,export_macro=TAO_CodecFactory_Export \ + -Wb,export_macro=TAO_CODECFACTORY_Export \ -Wb,export_include=tao/CodecFactory/codecfactory_export.h \ -Wb,unique_include=tao/CodecFactory/CodecFactory.h \ -iC CodecFactory @@ -38,6 +39,7 @@ project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults } Header_Files { + codecfactory_export.h *.h IOP_CodecA.h IOP_CodecC.h diff --git a/tao/CodecFactory/codecfactory_export.h b/tao/CodecFactory/codecfactory_export.h deleted file mode 100644 index 7c93ff47968..00000000000 --- a/tao/CodecFactory/codecfactory_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_CODECFACTORY_EXPORT_H -#define TAO_CODECFACTORY_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_CODECFACTORY_HAS_DLL) -# define TAO_CODECFACTORY_HAS_DLL 0 -# endif /* ! TAO_CODECFACTORY_HAS_DLL */ -#else -# if !defined (TAO_CODECFACTORY_HAS_DLL) -# define TAO_CODECFACTORY_HAS_DLL 1 -# endif /* ! TAO_CODECFACTORY_HAS_DLL */ -#endif - -#if defined (TAO_CODECFACTORY_HAS_DLL) && (TAO_CODECFACTORY_HAS_DLL == 1) -# if defined (TAO_CODECFACTORY_BUILD_DLL) -# define TAO_CodecFactory_Export ACE_Proper_Export_Flag -# define TAO_CODECFACTORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_CODECFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_CODECFACTORY_BUILD_DLL */ -# define TAO_CodecFactory_Export ACE_Proper_Import_Flag -# define TAO_CODECFACTORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_CODECFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_CODECFACTORY_BUILD_DLL */ -#else /* TAO_CODECFACTORY_HAS_DLL == 1 */ -# define TAO_CodecFactory_Export -# define TAO_CODECFACTORY_SINGLETON_DECLARATION(T) -# define TAO_CODECFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_CODECFACTORY_HAS_DLL == 1 */ - -#endif /* TAO_CODECFACTORY_EXPORT_H */ - -// End of auto generated file. |