diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-15 14:59:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-15 14:59:40 (GMT) |
| commit | 3c9c91a360104b97aa6ad27934ff7603c862a2f7 (patch) | |
| tree | e5fd73e62559f424eb5e6f679a7a362c9614ec32 | |
| parent | 442cb77bf31c02f83c47167ef9842b7756029227 (diff) | |
| parent | f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf (diff) | |
| download | CMake-3c9c91a360104b97aa6ad27934ff7603c862a2f7.zip CMake-3c9c91a360104b97aa6ad27934ff7603c862a2f7.tar.gz CMake-3c9c91a360104b97aa6ad27934ff7603c862a2f7.tar.bz2 | |
Merge topic 'update-kwsys'
f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys
a930de85d8 KWSys 2019-02-14 (e270ce9f)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2967
| -rw-r--r-- | Source/kwsys/Glob.hxx.in | 14 | ||||
| -rw-r--r-- | Source/kwsys/hashtable.hxx.in | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Source/kwsys/Glob.hxx.in b/Source/kwsys/Glob.hxx.in index bd4a176..4c3bde1 100644 --- a/Source/kwsys/Glob.hxx.in +++ b/Source/kwsys/Glob.hxx.in @@ -41,17 +41,9 @@ public: , content(c) { } - Message(const Message& msg) - : type(msg.type) - , content(msg.content) - { - } - Message& operator=(Message const& msg) - { - this->type = msg.type; - this->content = msg.content; - return *this; - } + ~Message() = default; + Message(const Message& msg) = default; + Message& operator=(Message const& msg) = default; }; typedef std::vector<Message> GlobMessages; diff --git a/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in index fc0d60e..0981c66 100644 --- a/Source/kwsys/hashtable.hxx.in +++ b/Source/kwsys/hashtable.hxx.in @@ -73,7 +73,7 @@ struct _Hashtable_node void public_method_to_quiet_warning_about_all_methods_private(); private: - void operator=(_Hashtable_node<_Val> const&); // poison node assignment + void operator=(_Hashtable_node<_Val> const&) = delete; }; template <class _Val, class _Key, class _HashFcn, class _ExtractKey, |