Fixing whitespace problems

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111755 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2010-08-22 00:15:28 +00:00
parent eb564e76cc
commit 6046aced82
268 changed files with 574 additions and 585 deletions

View File

@ -6,4 +6,4 @@ class Copyable
public: public:
}; };
#endif #endif // COPYABLE_H

View File

@ -23,4 +23,4 @@ public:
int DefaultOnly::count = 0; int DefaultOnly::count = 0;
#endif #endif // DEFAULTONLY_H

View File

@ -40,6 +40,6 @@ struct hash<Emplaceable>
} }
#endif #endif // _LIBCPP_MOVE
#endif #endif // EMPLACEABLE_H

View File

@ -36,6 +36,6 @@ struct hash<MoveOnly>
} }
#endif #endif // _LIBCPP_MOVE
#endif #endif // MOVEONLY_H

View File

@ -27,4 +27,4 @@ struct hash<NotConstructible>
} }
#endif #endif // NOTCONSTRUCTIBLE_H

View File

@ -34,5 +34,5 @@ int main()
m[6] = 6.5; m[6] = 6.5;
assert(m[6] == 6.5); assert(m[6] == 6.5);
assert(m.size() == 2); assert(m.size() == 2);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -41,5 +41,5 @@ int main()
assert(*m.begin() == V(1, 1)); assert(*m.begin() == V(1, 1));
assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin()) == V(2, 1));
assert(*next(m.begin(), 2) == V(3, 1)); assert(*next(m.begin(), 2) == V(3, 1));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -90,5 +90,5 @@ int main()
assert(*next(mo.begin()) == V(2, 1)); assert(*next(mo.begin()) == V(2, 1));
assert(*next(mo.begin(), 2) == V(3, 1)); assert(*next(mo.begin(), 2) == V(3, 1));
} }
#endif #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
} }

View File

@ -37,5 +37,5 @@ int main()
assert(*m.begin() == V(1, 1)); assert(*m.begin() == V(1, 1));
assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin()) == V(2, 1));
assert(*next(m.begin(), 2) == V(3, 1)); assert(*next(m.begin(), 2) == V(3, 1));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -39,5 +39,5 @@ int main()
assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin()) == V(2, 1));
assert(*next(m.begin(), 2) == V(3, 1)); assert(*next(m.begin(), 2) == V(3, 1));
assert(m.key_comp() == C(3)); assert(m.key_comp() == C(3));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -42,5 +42,5 @@ int main()
assert(*next(m.begin(), 2) == V(3, 1)); assert(*next(m.begin(), 2) == V(3, 1));
assert(m.key_comp() == C(3)); assert(m.key_comp() == C(3));
assert(m.get_allocator() == A(6)); assert(m.get_allocator() == A(6));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -68,5 +68,5 @@ int main()
assert(mo.size() == 0); assert(mo.size() == 0);
assert(distance(mo.begin(), mo.end()) == 0); assert(distance(mo.begin(), mo.end()) == 0);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -140,5 +140,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -143,5 +143,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -85,5 +85,5 @@ int main()
assert(m.begin()->first == 2); assert(m.begin()->first == 2);
assert(m.begin()->second == 3.5); assert(m.begin()->second == 3.5);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -78,5 +78,5 @@ int main()
assert(m.begin()->first == 2); assert(m.begin()->first == 2);
assert(m.begin()->second == 3.5); assert(m.begin()->second == 3.5);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -39,5 +39,5 @@ int main()
assert(*m.begin() == V(1, 1)); assert(*m.begin() == V(1, 1));
assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin()) == V(2, 1));
assert(*next(m.begin(), 2) == V(3, 1)); assert(*next(m.begin(), 2) == V(3, 1));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -51,5 +51,5 @@ int main()
assert(r->first == 3); assert(r->first == 3);
assert(r->second == 3); assert(r->second == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -54,5 +54,5 @@ int main()
assert(r.first->first == 3); assert(r.first->first == 3);
assert(r.first->second == 3); assert(r.first->second == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -46,5 +46,5 @@ int main()
assert(*++i == V(3, 1)); assert(*++i == V(3, 1));
assert(*++i == V(3, 1.5)); assert(*++i == V(3, 1.5));
assert(*++i == V(3, 2)); assert(*++i == V(3, 2));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -72,5 +72,5 @@ int main()
assert(mo.get_allocator() == A(7)); assert(mo.get_allocator() == A(7));
assert(mo.key_comp() == C(5)); assert(mo.key_comp() == C(5));
} }
#endif #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
} }

View File

@ -45,5 +45,5 @@ int main()
assert(*++i == V(3, 1)); assert(*++i == V(3, 1));
assert(*++i == V(3, 1.5)); assert(*++i == V(3, 1.5));
assert(*++i == V(3, 2)); assert(*++i == V(3, 2));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -50,5 +50,5 @@ int main()
assert(*++i == V(3, 1.5)); assert(*++i == V(3, 1.5));
assert(*++i == V(3, 2)); assert(*++i == V(3, 2));
assert(m.key_comp() == Cmp(4)); assert(m.key_comp() == Cmp(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -53,5 +53,5 @@ int main()
assert(*++i == V(3, 2)); assert(*++i == V(3, 2));
assert(m.key_comp() == Cmp(4)); assert(m.key_comp() == Cmp(4));
assert(m.get_allocator() == A(5)); assert(m.get_allocator() == A(5));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -74,5 +74,5 @@ int main()
assert(mo.size() == 0); assert(mo.size() == 0);
assert(distance(mo.begin(), mo.end()) == 0); assert(distance(mo.begin(), mo.end()) == 0);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -140,5 +140,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -143,5 +143,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -78,5 +78,5 @@ int main()
assert(m.begin()->first == 2); assert(m.begin()->first == 2);
assert(m.begin()->second == 3.5); assert(m.begin()->second == 3.5);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -78,5 +78,5 @@ int main()
assert(m.begin()->first == 2); assert(m.begin()->first == 2);
assert(m.begin()->second == 3.5); assert(m.begin()->second == 3.5);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -49,5 +49,5 @@ int main()
assert(*++i == V(3, 1)); assert(*++i == V(3, 1));
assert(*++i == V(3, 2)); assert(*++i == V(3, 2));
assert(*++i == V(3, 1.5)); assert(*++i == V(3, 1.5));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -51,5 +51,5 @@ int main()
assert(r->first == 3); assert(r->first == 3);
assert(r->second == 2); assert(r->second == 2);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -50,5 +50,5 @@ int main()
assert(r->first == 3); assert(r->first == 3);
assert(r->second == 3); assert(r->second == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -67,5 +67,5 @@ int main()
assert(m.size() == 1); assert(m.size() == 1);
assert(*r == 2); assert(*r == 2);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -67,5 +67,5 @@ int main()
assert(m.size() == 1); assert(m.size() == 1);
assert(*r == 2); assert(*r == 2);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -34,5 +34,5 @@ int main()
assert(*++i == V(6)); assert(*++i == V(6));
assert(*++i == V(8)); assert(*++i == V(8));
assert(*++i == V(10)); assert(*++i == V(10));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -45,5 +45,5 @@ int main()
assert(m.size() == 4); assert(m.size() == 4);
assert(*r == 3); assert(*r == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -45,5 +45,5 @@ int main()
assert(m.size() == 4); assert(m.size() == 4);
assert(*r == 3); assert(*r == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -32,5 +32,5 @@ int main()
assert(*++i == V(4)); assert(*++i == V(4));
assert(*++i == V(5)); assert(*++i == V(5));
assert(*++i == V(6)); assert(*++i == V(6));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -114,5 +114,5 @@ int main()
assert(*next(mo.begin(), 7) == 3); assert(*next(mo.begin(), 7) == 3);
assert(*next(mo.begin(), 8) == 3); assert(*next(mo.begin(), 8) == 3);
} }
#endif #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
} }

View File

@ -31,5 +31,5 @@ int main()
assert(*++i == V(4)); assert(*++i == V(4));
assert(*++i == V(5)); assert(*++i == V(5));
assert(*++i == V(6)); assert(*++i == V(6));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -34,5 +34,5 @@ int main()
assert(*++i == V(5)); assert(*++i == V(5));
assert(*++i == V(6)); assert(*++i == V(6));
assert(m.key_comp() == Cmp(10)); assert(m.key_comp() == Cmp(10));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -37,5 +37,5 @@ int main()
assert(*++i == V(6)); assert(*++i == V(6));
assert(m.key_comp() == Cmp(10)); assert(m.key_comp() == Cmp(10));
assert(m.get_allocator() == A(4)); assert(m.get_allocator() == A(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -75,5 +75,5 @@ int main()
assert(mo.size() == 0); assert(mo.size() == 0);
assert(distance(mo.begin(), mo.end()) == 0); assert(distance(mo.begin(), mo.end()) == 0);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -137,5 +137,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -140,5 +140,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -73,5 +73,5 @@ int main()
assert(m.size() == 1); assert(m.size() == 1);
assert(*r.first == 2); assert(*r.first == 2);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -67,5 +67,5 @@ int main()
assert(m.size() == 1); assert(m.size() == 1);
assert(*r == 2); assert(*r == 2);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -34,5 +34,5 @@ int main()
assert(*++i == V(6)); assert(*++i == V(6));
assert(*++i == V(8)); assert(*++i == V(8));
assert(*++i == V(10)); assert(*++i == V(10));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -45,5 +45,5 @@ int main()
assert(m.size() == 3); assert(m.size() == 3);
assert(*r == 3); assert(*r == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -49,5 +49,5 @@ int main()
assert(m.size() == 3); assert(m.size() == 3);
assert(*r.first == 3); assert(*r.first == 3);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -32,5 +32,5 @@ int main()
assert(*++i == V(4)); assert(*++i == V(4));
assert(*++i == V(5)); assert(*++i == V(5));
assert(*++i == V(6)); assert(*++i == V(6));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -90,5 +90,5 @@ int main()
assert(*next(mo.begin()) == 2); assert(*next(mo.begin()) == 2);
assert(*next(mo.begin(), 2) == 3); assert(*next(mo.begin(), 2) == 3);
} }
#endif #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
} }

View File

@ -31,5 +31,5 @@ int main()
assert(*++i == V(4)); assert(*++i == V(4));
assert(*++i == V(5)); assert(*++i == V(5));
assert(*++i == V(6)); assert(*++i == V(6));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -34,5 +34,5 @@ int main()
assert(*++i == V(5)); assert(*++i == V(5));
assert(*++i == V(6)); assert(*++i == V(6));
assert(m.key_comp() == Cmp(10)); assert(m.key_comp() == Cmp(10));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -37,5 +37,5 @@ int main()
assert(*++i == V(6)); assert(*++i == V(6));
assert(m.key_comp() == Cmp(10)); assert(m.key_comp() == Cmp(10));
assert(m.get_allocator() == A(4)); assert(m.get_allocator() == A(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -69,5 +69,5 @@ int main()
assert(mo.size() == 0); assert(mo.size() == 0);
assert(distance(mo.begin(), mo.end()) == 0); assert(distance(mo.begin(), mo.end()) == 0);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -137,5 +137,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -140,5 +140,5 @@ int main()
assert(m3.key_comp() == C(5)); assert(m3.key_comp() == C(5));
assert(m1.empty()); assert(m1.empty());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -248,4 +248,4 @@ operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y
return x.base() - y.base(); return x.base() - y.base();
} }
#endif #endif // ITERATORS_H

View File

@ -34,7 +34,7 @@ struct test
test(const value_compare& comp, container_type&& c, test(const value_compare& comp, container_type&& c,
const test_allocator<int>& a) : base(comp, std::move(c), a) {} const test_allocator<int>& a) : base(comp, std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
using base::c; using base::c;

View File

@ -34,7 +34,7 @@ struct test
test(const value_compare& comp, container_type&& c, test(const value_compare& comp, container_type&& c,
const test_allocator<int>& a) : base(comp, std::move(c), a) {} const test_allocator<int>& a) : base(comp, std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
using base::c; using base::c;

View File

@ -45,7 +45,7 @@ struct test
test(const value_compare& comp, container_type&& c, test(const value_compare& comp, container_type&& c,
const test_allocator<int>& a) : base(comp, std::move(c), a) {} const test_allocator<int>& a) : base(comp, std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
using base::c; using base::c;

View File

@ -45,7 +45,7 @@ struct test
test(const value_compare& comp, container_type&& c, test(const value_compare& comp, container_type&& c,
const test_allocator<int>& a) : base(comp, std::move(c), a) {} const test_allocator<int>& a) : base(comp, std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
using base::c; using base::c;

View File

@ -52,7 +52,7 @@ struct test
using base::c; using base::c;
}; };
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -64,5 +64,5 @@ int main()
assert(q.size() == 5); assert(q.size() == 5);
assert(q.c.get_allocator() == test_allocator<MoveOnly>(6)); assert(q.c.get_allocator() == test_allocator<MoveOnly>(6));
assert(q.top() == MoveOnly(4)); assert(q.top() == MoveOnly(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -38,5 +38,5 @@ int main()
q = std::move(qo); q = std::move(qo);
assert(q.size() == 5); assert(q.size() == 5);
assert(q.top() == MoveOnly(4)); assert(q.top() == MoveOnly(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -36,5 +36,5 @@ int main()
std::priority_queue<MoveOnly> q(std::less<MoveOnly>(), make<std::vector<MoveOnly> >(5)); std::priority_queue<MoveOnly> q(std::less<MoveOnly>(), make<std::vector<MoveOnly> >(5));
assert(q.size() == 5); assert(q.size() == 5);
assert(q.top() == MoveOnly(4)); assert(q.top() == MoveOnly(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,5 +28,5 @@ int main()
std::vector<MoveOnly>(a, a+n/2)); std::vector<MoveOnly>(a, a+n/2));
assert(q.size() == n); assert(q.size() == n);
assert(q.top() == MoveOnly(8)); assert(q.top() == MoveOnly(8));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -37,5 +37,5 @@ int main()
std::priority_queue<MoveOnly> q = std::move(qo); std::priority_queue<MoveOnly> q = std::move(qo);
assert(q.size() == 5); assert(q.size() == 5);
assert(q.top() == MoveOnly(4)); assert(q.top() == MoveOnly(4));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,5 +28,5 @@ int main()
assert(q.top() == Emplaceable(3, 4.5)); assert(q.top() == Emplaceable(3, 4.5));
q.emplace(2, 3.5); q.emplace(2, 3.5);
assert(q.top() == Emplaceable(3, 4.5)); assert(q.top() == Emplaceable(3, 4.5));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -13,7 +13,6 @@
// bool empty() const; // bool empty() const;
#include <queue> #include <queue>
#include <cassert> #include <cassert>

View File

@ -28,5 +28,5 @@ int main()
assert(q.top() == 3); assert(q.top() == 3);
q.push(2); q.push(2);
assert(q.top() == 3); assert(q.top() == 3);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -27,7 +27,7 @@ struct test
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {} test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
}; };

View File

@ -39,7 +39,7 @@ struct test
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {} test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
}; };

View File

@ -47,7 +47,7 @@ struct test
allocator_type get_allocator() {return this->c.get_allocator();} allocator_type get_allocator() {return this->c.get_allocator();}
}; };
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -55,5 +55,5 @@ int main()
test<MoveOnly> q(make<C>(5), test_allocator<MoveOnly>(4)); test<MoveOnly> q(make<C>(5), test_allocator<MoveOnly>(4));
assert(q.get_allocator() == test_allocator<MoveOnly>(4)); assert(q.get_allocator() == test_allocator<MoveOnly>(4));
assert(q.size() == 5); assert(q.size() == 5);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -47,7 +47,7 @@ struct test
allocator_type get_allocator() {return this->c.get_allocator();} allocator_type get_allocator() {return this->c.get_allocator();}
}; };
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -56,5 +56,5 @@ int main()
test<MoveOnly> q2(std::move(q), test_allocator<MoveOnly>(5)); test<MoveOnly> q2(std::move(q), test_allocator<MoveOnly>(5));
assert(q2.get_allocator() == test_allocator<MoveOnly>(5)); assert(q2.get_allocator() == test_allocator<MoveOnly>(5));
assert(q2.size() == 5); assert(q2.size() == 5);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -37,5 +37,5 @@ int main()
std::queue<MoveOnly> q2 = std::move(q); std::queue<MoveOnly> q2 = std::move(q);
assert(q2.size() == 5); assert(q2.size() == 5);
assert(q.empty()); assert(q.empty());
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,12 +28,12 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
std::queue<MoveOnly> q(make<std::deque<MoveOnly> >(5)); std::queue<MoveOnly> q(make<std::deque<MoveOnly> >(5));
assert(q.size() == 5); assert(q.size() == 5);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -38,5 +38,5 @@ int main()
q2 = std::move(q); q2 = std::move(q);
assert(q2.size() == 5); assert(q2.size() == 5);
assert(q.empty()); assert(q.empty());
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -26,5 +26,5 @@ int main()
assert(q.size() == 3); assert(q.size() == 3);
assert(q.front() == Emplaceable(1, 2.5)); assert(q.front() == Emplaceable(1, 2.5));
assert(q.back() == Emplaceable(3, 4.5)); assert(q.back() == Emplaceable(3, 4.5));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -32,5 +32,5 @@ int main()
assert(q.size() == 3); assert(q.size() == 3);
assert(q.front() == MoveOnly(1)); assert(q.front() == MoveOnly(1));
assert(q.back() == MoveOnly(3)); assert(q.back() == MoveOnly(3));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -27,7 +27,7 @@ struct test
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {} test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
}; };

View File

@ -39,7 +39,7 @@ struct test
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {} test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {} test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
#endif #endif // _LIBCPP_MOVE
test_allocator<int> get_allocator() {return c.get_allocator();} test_allocator<int> get_allocator() {return c.get_allocator();}
}; };

View File

@ -47,7 +47,7 @@ struct test
allocator_type get_allocator() {return this->c.get_allocator();} allocator_type get_allocator() {return this->c.get_allocator();}
}; };
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -55,5 +55,5 @@ int main()
test<MoveOnly> q(make<C>(5), test_allocator<MoveOnly>(4)); test<MoveOnly> q(make<C>(5), test_allocator<MoveOnly>(4));
assert(q.get_allocator() == test_allocator<MoveOnly>(4)); assert(q.get_allocator() == test_allocator<MoveOnly>(4));
assert(q.size() == 5); assert(q.size() == 5);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -47,7 +47,7 @@ struct test
allocator_type get_allocator() {return this->c.get_allocator();} allocator_type get_allocator() {return this->c.get_allocator();}
}; };
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -56,5 +56,5 @@ int main()
test<MoveOnly> q2(std::move(q), test_allocator<MoveOnly>(5)); test<MoveOnly> q2(std::move(q), test_allocator<MoveOnly>(5));
assert(q2.get_allocator() == test_allocator<MoveOnly>(5)); assert(q2.get_allocator() == test_allocator<MoveOnly>(5));
assert(q2.size() == 5); assert(q2.size() == 5);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -37,5 +37,5 @@ int main()
std::stack<MoveOnly> q2 = std::move(q); std::stack<MoveOnly> q2 = std::move(q);
assert(q2.size() == 5); assert(q2.size() == 5);
assert(q.empty()); assert(q.empty());
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,12 +28,12 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
std::stack<MoveOnly> q(make<std::deque<MoveOnly> >(5)); std::stack<MoveOnly> q(make<std::deque<MoveOnly> >(5));
assert(q.size() == 5); assert(q.size() == 5);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -28,7 +28,7 @@ make(int n)
return c; return c;
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -38,5 +38,5 @@ int main()
q2 = std::move(q); q2 = std::move(q);
assert(q2.size() == 5); assert(q2.size() == 5);
assert(q.empty()); assert(q.empty());
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -25,5 +25,5 @@ int main()
q.emplace(3, 4.5); q.emplace(3, 4.5);
assert(q.size() == 3); assert(q.size() == 3);
assert(q.top() == Emplaceable(3, 4.5)); assert(q.top() == Emplaceable(3, 4.5));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -29,5 +29,5 @@ int main()
q.push(MoveOnly(3)); q.push(MoveOnly(3));
assert(q.size() == 3); assert(q.size() == 3);
assert(q.top() == MoveOnly(3)); assert(q.top() == MoveOnly(3));
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -24,5 +24,5 @@ int main()
assert(d[1] == 4); assert(d[1] == 4);
assert(d[2] == 5); assert(d[2] == 5);
assert(d[3] == 6); assert(d[3] == 6);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -43,5 +43,5 @@ int main()
assert(v2 == v); assert(v2 == v);
assert(v2.get_allocator() == other_allocator<int>(-2)); assert(v2.get_allocator() == other_allocator<int>(-2));
} }
#endif #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
} }

View File

@ -23,5 +23,5 @@ int main()
assert(d[1] == 4); assert(d[1] == 4);
assert(d[2] == 5); assert(d[2] == 5);
assert(d[3] == 6); assert(d[3] == 6);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -26,5 +26,5 @@ int main()
assert(d[1] == 4); assert(d[1] == 4);
assert(d[2] == 5); assert(d[2] == 5);
assert(d[3] == 6); assert(d[3] == 6);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -50,5 +50,5 @@ int main()
assert(c1.size() == 0); assert(c1.size() == 0);
assert(c3.get_allocator() == c1.get_allocator()); assert(c3.get_allocator() == c1.get_allocator());
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -65,5 +65,5 @@ int main()
assert(c3.get_allocator() == A(3)); assert(c3.get_allocator() == A(3));
assert(c1.size() != 0); assert(c1.size() != 0);
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -68,5 +68,5 @@ int main()
assert(c1.size() == 0); assert(c1.size() == 0);
assert(c3.get_allocator() == A(5)); assert(c3.get_allocator() == A(5));
} }
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -24,5 +24,5 @@ int main()
assert(d[1] == 4); assert(d[1] == 4);
assert(d[2] == 5); assert(d[2] == 5);
assert(d[3] == 6); assert(d[3] == 6);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -32,7 +32,7 @@ test(unsigned n)
#ifdef _LIBCPP_MOVE #ifdef _LIBCPP_MOVE
for (const_iterator i = d.begin(), e = d.end(); i != e; ++i) for (const_iterator i = d.begin(), e = d.end(); i != e; ++i)
assert(*i == T()); assert(*i == T());
#endif #endif // _LIBCPP_MOVE
} }
assert(DefaultOnly::count == 0); assert(DefaultOnly::count == 0);
} }

View File

@ -85,7 +85,7 @@ testN(int start, int N)
} }
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -95,5 +95,5 @@ int main()
for (int i = 0; i < N; ++i) for (int i = 0; i < N; ++i)
for (int j = 0; j < N; ++j) for (int j = 0; j < N; ++j)
testN(rng[i], rng[j]); testN(rng[i], rng[j]);
#endif #endif // _LIBCPP_MOVE
} }

View File

@ -60,7 +60,7 @@ testN(int start, int N)
test(c1); test(c1);
} }
#endif #endif // _LIBCPP_MOVE
int main() int main()
{ {
@ -70,5 +70,5 @@ int main()
for (int i = 0; i < N; ++i) for (int i = 0; i < N; ++i)
for (int j = 0; j < N; ++j) for (int j = 0; j < N; ++j)
testN(rng[i], rng[j]); testN(rng[i], rng[j]);
#endif #endif // _LIBCPP_MOVE
} }

Some files were not shown because too many files have changed in this diff Show More