mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 01:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
* upstream-KWSys:
  KWSys 2019-02-14 (e270ce9f)
This commit is contained in:
Brad King
2019-02-14 10:55:44 -05:00
parent e3353a0175 a930de85d8
commit f510aafbfc
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/kwsys/Glob.hxx.in
+3 -11
View File
@@ -41,17 +41,9 @@ public:
, content(c) , content(c)
{ {
} }
Message(const Message& msg) ~Message() = default;
: type(msg.type) Message(const Message& msg) = default;
, content(msg.content) Message& operator=(Message const& msg) = default;
{
}
Message& operator=(Message const& msg)
{
this->type = msg.type;
this->content = msg.content;
return *this;
}
}; };
typedef std::vector<Message> GlobMessages; typedef std::vector<Message> GlobMessages;
Source/kwsys/hashtable.hxx.in
+1 -1
View File
@@ -73,7 +73,7 @@ struct _Hashtable_node
void public_method_to_quiet_warning_about_all_methods_private(); void public_method_to_quiet_warning_about_all_methods_private();
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, template <class _Val, class _Key, class _HashFcn, class _ExtractKey,