summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2019-02-14 15:13:42 (GMT)
committerBrad King <brad.king@kitware.com>2019-02-14 15:55:44 (GMT)
commita930de85d88891b2516c60306bb49cc85d38c5a8 (patch)
treef23fa40fc56926788f3a83ef0bcd416aa7ca30b2
parentf3999a21c85e6caf19feef7c90afce3969d9102a (diff)
downloadCMake-a930de85d88891b2516c60306bb49cc85d38c5a8.zip
CMake-a930de85d88891b2516c60306bb49cc85d38c5a8.tar.gz
CMake-a930de85d88891b2516c60306bb49cc85d38c5a8.tar.bz2
KWSys 2019-02-14 (e270ce9f)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit e270ce9fc60971006e934e9d53d11be5f85efc39 (master). Upstream Shortlog ----------------- Albert Astals Cid (2): 95ced423 hashtable: delete assignment operator instead of poisoning it 6090d36b Glob: Use the default copy constructor and assignment operator
-rw-r--r--Glob.hxx.in14
-rw-r--r--hashtable.hxx.in2
2 files changed, 4 insertions, 12 deletions
diff --git a/Glob.hxx.in b/Glob.hxx.in
index bd4a176..4c3bde1 100644
--- a/Glob.hxx.in
+++ b/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/hashtable.hxx.in b/hashtable.hxx.in
index fc0d60e..0981c66 100644
--- a/hashtable.hxx.in
+++ b/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,