diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-21 22:43:10 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-21 22:43:10 +0000 |
| commit | aeed74f360e9e5092f25cad872bcd172431b9bca (patch) | |
| tree | 8822235cdb3a8d61a4427496e31eafc8d978edda | |
| parent | 6699704a0d416c5eb887d0564681d2d28d1c8e54 (diff) | |
Merging r340320:
------------------------------------------------------------------------
r340320 | tstellar | 2018-08-21 21:12:57 +0200 (Tue, 21 Aug 2018) | 11 lines
MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMP: Fix build with newer libstdc++
Summary: llvm.org/PR38654
Reviewers: homerdin
Reviewed By: homerdin
Subscribers: cfe-commits, llvm-commits
Differential Revision: https://reviews.llvm.org/D51020
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/test-suite/branches/release_70@340353 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h index 138704fc..9db368db 100644 --- a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h +++ b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h @@ -99,9 +99,9 @@ struct malloc_plus_memory_entry { struct cmp_str { - bool operator()(char const *a, char const *b) + bool operator()(const string &a, const string &b) { - return strcmp(a, b) < 0; + return a.compare(b) < 0; } }; |