diff options
author | Brad King <brad.king@kitware.com> | 2019-02-14 15:55:44 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-02-14 15:55:44 (GMT) |
commit | f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf (patch) | |
tree | ae241533b7640004f78caae20ab1966946d6de7a /Source/kwsys | |
parent | e3353a0175fb27bc2967c3df78b8be1c0615b21d (diff) | |
parent | a930de85d88891b2516c60306bb49cc85d38c5a8 (diff) | |
download | CMake-f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf.zip CMake-f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf.tar.gz CMake-f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-02-14 (e270ce9f)
Diffstat (limited to 'Source/kwsys')
-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, |