diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-25 13:27:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 13:27:03 +0100 |
| commit | fdf9fe05d6a4499ced8b55b52f179275ce0c90b0 (patch) | |
| tree | b63469e57597713738afea9d42ef0e78fcb9d7d4 /TAO/tao/Compression/Compressor_Factory.h | |
| parent | e4bcaf22324492a0d784890cd9ca86b4a707e68f (diff) | |
| parent | ab938af466a77a9992d95da9fc832ff50444255f (diff) | |
| download | ATCD-fdf9fe05d6a4499ced8b55b52f179275ce0c90b0.tar.gz | |
Merge pull request #1440 from jwillemsen/jw-cleanupvc6
Cleanup for vc6, use nullptr, remove redundant void, layout changes
Diffstat (limited to 'TAO/tao/Compression/Compressor_Factory.h')
| -rw-r--r-- | TAO/tao/Compression/Compressor_Factory.h | 7 |
1 files changed, 2 insertions, 5 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; }; } |