Author: hans Date: Tue Aug 21 15:43:10 2018 New Revision: 340353 URL: http://llvm.org/viewvc/llvm-project?rev=340353&view=rev Log: 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 ------------------------------------------------------------------------ Modified: test-suite/branches/release_70/ (props changed) test-suite/branches/release_70/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h Propchange: test-suite/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 21 15:43:10 2018 @@ -1 +1 @@ -/test-suite/trunk:338710 +/test-suite/trunk:338710,340320 Modified: test-suite/branches/release_70/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_70/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/CLAMR/MallocPlus.h?rev=340353&r1=340352&r2=340353&view=diff ============================================================================== --- test-suite/branches/release_70/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h (original) +++ test-suite/branches/release_70/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/MallocPlus.h Tue Aug 21 15:43:10 2018 @@ -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; } }; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits