diff options
Diffstat (limited to 'TAO/tao/Compression')
| -rw-r--r-- | TAO/tao/Compression/Compressor_Factory.h | 7 | ||||
| -rw-r--r-- | TAO/tao/Compression/zlib/ZlibCompressor_Factory.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h index 95481ddaeab..7204ce20366 100644 --- a/TAO/tao/Compression/Compressor_Factory.h +++ b/TAO/tao/Compression/Compressor_Factory.h @@ -41,11 +41,8 @@ namespace TAO private: ::Compression::CompressorId const compressor_id_; -#if defined (ACE_WIN32_VC14) - // Workaround for connect issue 1577211 - ACE_UNIMPLEMENTED_FUNC (CompressorFactory (const CompressorFactory &)) - ACE_UNIMPLEMENTED_FUNC (CompressorFactory &operator = (const CompressorFactory &)) -#endif + CompressorFactory (const CompressorFactory &) = delete; + CompressorFactory &operator = (const CompressorFactory &) = delete; }; } diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h index 5274e54eb49..1cdd468357b 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h @@ -40,8 +40,8 @@ namespace TAO ::Compression::CompressionLevel compression_level); private: - ACE_UNIMPLEMENTED_FUNC (Zlib_CompressorFactory (const Zlib_CompressorFactory &)) - ACE_UNIMPLEMENTED_FUNC (Zlib_CompressorFactory &operator= (const Zlib_CompressorFactory &)) + Zlib_CompressorFactory (const Zlib_CompressorFactory &) = delete; + Zlib_CompressorFactory &operator= (const Zlib_CompressorFactory &) = delete; // Ensure we can lock with imutability (i.e. const) mutable TAO_SYNCH_MUTEX mutex_; |