diff options
Diffstat (limited to 'TAO/tao/CodecFactory/CodecFactory_impl.h')
| -rw-r--r-- | TAO/tao/CodecFactory/CodecFactory_impl.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index ba0859f667b..6699719071a 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/CodecFactory/IOP_Codec_includeC.h" +#include "IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,10 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Codeset_Translator_Base; - /** * @class TAO_CodecFactory * @@ -57,27 +53,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)); - /// Create a Coder/Decoder for the given type of encoding and codesets. - virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding, - IOP::CodecFactory::UnsupportedCodeset)); - private: + /// Prevent copying through the copy constructor and the assignment /// operator. - TAO_CodecFactory (const TAO_CodecFactory &); - void operator= (const TAO_CodecFactory &); - - IOP::Codec_ptr create_codec_i (CORBA::Octet major, - CORBA::Octet minor, - IOP::EncodingFormat encoding_format, - TAO_Codeset_Translator_Base * char_trans, - TAO_Codeset_Translator_Base * wchar_trans - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)); + ACE_UNIMPLEMENTED_FUNC ( + TAO_CodecFactory (const TAO_CodecFactory &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &)) + private: /// Pointer to the ORB Core. @@ -89,8 +72,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ |