Author: marshall
Date: Tue Jan 31 07:12:32 2017
New Revision: 293623
URL: http://llvm.org/viewvc/llvm-project?rev=293623&view=rev
Log:
Fix up some no-exception compile failures
Modified:
libcxx/trunk/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
Modified:
libcxx/trunk/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp?rev=293623&r1=293622&r2=293623&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
(original)
+++ libcxx/trunk/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
Tue Jan 31 07:12:32 2017
@@ -18,6 +18,7 @@
#include "test_allocator.h"
#include "min_allocator.h"
+#ifndef TEST_HAS_NO_EXCEPTIONS
template <class T>
struct alloc_imp {
bool active;
@@ -44,7 +45,7 @@ struct poca_alloc {
alloc_imp<T> *imp;
- poca_alloc(alloc_imp<T> *ximp) : imp (ximp) {}
+ poca_alloc(alloc_imp<T> *imp_) : imp (imp_) {}
template <class U>
poca_alloc(const poca_alloc<U>& other) : imp(other.imp) {}
@@ -65,6 +66,15 @@ bool operator!=(const poca_alloc<T>& lhs
return lhs.imp != rhs.imp;
}
+template <class S>
+void test_assign(S &s1, const S& s2)
+{
+ try { s1 = s2; }
+ catch ( std::bad_alloc &) { return; }
+ assert(false);
+}
+#endif
+
template <class S>
@@ -78,16 +88,6 @@ test(S s1, const typename S::allocator_t
assert(s2.get_allocator() == a);
}
-#ifndef TEST_HAS_NO_EXCEPTIONS
-template <class S>
-void test_assign(S &s1, const S& s2)
-{
- try { s1 = s2; }
- catch ( std::bad_alloc &) { return; }
- assert(false);
-}
-#endif
-
int main()
{
{
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
