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
------------------------------------------------------------------------
llvm-svn: 340353
diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h
index 138704f..9db368d 100644
--- a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h
+++ b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h
@@ -99,9 +99,9 @@
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;
}
};
