diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-10 12:21:53 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-10 08:22:00 -0400 |
| commit | d11a5d8f2b2a23a47306a09061fbd2566ef6d43f (patch) | |
| tree | 6c89cf71b38c2e5b768d354de2a3222f9bba75f4 /Source | |
| parent | 6857aaaa062f3526fc54438472fe676bcda5842e (diff) | |
| parent | a54d96b72279e4426ca21190951b2c0c5401cb74 (diff) | |
| download | cmake-d11a5d8f2b2a23a47306a09061fbd2566ef6d43f.tar.gz | |
Merge topic 'invalid_alias' into release-3.17
a54d96b722 cmAlgorithms: Fix -Wnon-c-typedef-for-linkage warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4438
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmAlgorithms.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index 19da2a08ee..c0ac5512a3 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -139,7 +139,7 @@ template <typename ForwardIterator> ForwardIterator cmRemoveDuplicates(ForwardIterator first, ForwardIterator last) { using Value = typename std::iterator_traits<ForwardIterator>::value_type; - using Hash = struct + struct Hash { std::size_t operator()(ForwardIterator it) const { @@ -147,7 +147,7 @@ ForwardIterator cmRemoveDuplicates(ForwardIterator first, ForwardIterator last) } }; - using Equal = struct + struct Equal { bool operator()(ForwardIterator it1, ForwardIterator it2) const { |