This is an archive of the discontinued LLVM Phabricator instance.

Differential D54643

[libcxx] [test] Portability fix: add missing headers to unordered containers tests.
ClosedPublic

Authored by amakc11 on Nov 16 2018, 11:35 AM.

Details

Reviewers
EricWF
ldionne
Summary

A bunch of unordered containers tests call library functions, but don't directly include the corresponding header files:

  1. fabs() (defined in <cmath> which is not included);
  2. is_permutation() (defined in <algorithm> which is not included);
  3. next() (defined in <iterator> which is not included).

As a result, these tests won't compile against some conformant libraries.
Please note, that the list of the updated files might be incomplete, since I don't run "post C++11" tests.

Diff Detail

Repository
rCXX libc++

Event Timeline

amakc11 created this revision.Nov 16 2018, 11:35 AM
Herald added subscribers: libcxx-commits, ldionne. · View Herald TranscriptNov 16 2018, 11:35 AM
ldionne accepted this revision.Nov 16 2018, 11:37 AM

Thanks for the fix! Do you have commit access?

This revision is now accepted and ready to land.Nov 16 2018, 11:37 AM
amakc11 added a comment.Nov 16 2018, 11:43 AM

No, I don't.

ldionne closed this revision.Nov 16 2018, 11:55 AM

Committed as r347085. Thanks!

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
22

Two things:

  1. Typo
  2. We like to order includes

I fixed those two things when I pushed the patch!

Revision Contents

PathSize
test/
std/
containers/
unord/
unord.map/
unord.map.cnstr/
1 line
1 line
1 line
1 line
unord.multimap/
unord.multimap.cnstr/
2 lines
1 line
1 line
1 line
1 line
unord.multiset/
1 line
unord.multiset.cnstr/
2 lines
1 line
1 line
1 line
1 line
unord.set/
1 line
unord.set.cnstr/
2 lines
1 line
1 line
1 line
1 line

Diff 174413

test/std/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp

Show All 15 Lines
// class unordered_map // class unordered_map
// unordered_map& operator=(initializer_list<value_type> il); // unordered_map& operator=(initializer_list<value_type> il);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
{ {
▲ Show 20 Lines • Show All 65 Lines • Show Last 20 Lines

test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp

Show All 15 Lines
// class unordered_map // class unordered_map
// unordered_map& operator=(unordered_map&& u); // unordered_map& operator=(unordered_map&& u);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 186 Lines • Show Last 20 Lines

test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp

Show All 15 Lines
// class unordered_map // class unordered_map
// unordered_map(initializer_list<value_type> il); // unordered_map(initializer_list<value_type> il);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines

test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp

Show All 14 Lines
// template <class InputIterator> // template <class InputIterator>
// unordered_map(InputIterator first, InputIterator last); // unordered_map(InputIterator first, InputIterator last);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#include "../../../NotConstructible.h" #include "../../../NotConstructible.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp

Show All 13 Lines
// class unordered_multimap // class unordered_multimap
// unordered_multimap& operator=(const unordered_multimap& u); // unordered_multimap& operator=(const unordered_multimap& u);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <algorithm>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 200 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp

Show All 15 Lines
// class unordered_multimap // class unordered_multimap
// unordered_multimap& operator=(initializer_list<value_type> il); // unordered_multimap& operator=(initializer_list<value_type> il);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
▲ Show 20 Lines • Show All 114 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp

Show All 15 Lines
// class unordered_multimap // class unordered_multimap
// unordered_multimap& operator=(unordered_multimap&& u); // unordered_multimap& operator=(unordered_multimap&& u);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp

Show All 15 Lines
// class unordered_multimap // class unordered_multimap
// unordered_multimap(initializer_list<value_type> il); // unordered_multimap(initializer_list<value_type> il);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 223 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp

Show All 14 Lines
// template <class InputIterator> // template <class InputIterator>
// unordered_multimap(InputIterator first, InputIterator last); // unordered_multimap(InputIterator first, InputIterator last);
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#include "../../../NotConstructible.h" #include "../../../NotConstructible.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
▲ Show 20 Lines • Show All 235 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/erase_range.pass.cpp

Show All 11 Lines
// template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>, // template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_multiset // class unordered_multiset
// iterator erase(const_iterator first, const_iterator last) // iterator erase(const_iterator first, const_iterator last)
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <iterator>
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
{ {
{ {
typedef std::unordered_multiset<int> C; typedef std::unordered_multiset<int> C;
typedef int P; typedef int P;
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp

Show All 12 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_multiset // class unordered_multiset
// unordered_multiset& operator=(const unordered_multiset& u); // unordered_multiset& operator=(const unordered_multiset& u);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <algotithm>
ldionneUnsubmitted
Not Done
ReplyInline Actions

Two things:

  1. Typo
  2. We like to order includes

I fixed those two things when I pushed the patch!

ldionne: Two things: 1. Typo 2. We like to order includes I fixed those two things when I pushed the…
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 183 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp

Show All 14 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_multiset // class unordered_multiset
// unordered_multiset& operator=(initializer_list<value_type> il); // unordered_multiset& operator=(initializer_list<value_type> il);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp

Show All 14 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_multiset // class unordered_multiset
// unordered_multiset& operator=(unordered_multiset&& u); // unordered_multiset& operator=(unordered_multiset&& u);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp

Show All 14 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_multiset // class unordered_multiset
// unordered_multiset(initializer_list<value_type> il); // unordered_multiset(initializer_list<value_type> il);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp

Show All 13 Lines
// class unordered_multiset // class unordered_multiset
// template <class InputIterator> // template <class InputIterator>
// unordered_multiset(InputIterator first, InputIterator last); // unordered_multiset(InputIterator first, InputIterator last);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 140 Lines • Show Last 20 Lines

test/std/containers/unord/unord.set/erase_range.pass.cpp

Show All 11 Lines
// template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>, // template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_set // class unordered_set
// iterator erase(const_iterator first, const_iterator last) // iterator erase(const_iterator first, const_iterator last)
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <algotithm>
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
{ {
{ {
typedef std::unordered_set<int> C; typedef std::unordered_set<int> C;
typedef int P; typedef int P;
▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines

test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp

Show All 12 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_set // class unordered_set
// unordered_set& operator=(const unordered_set& u); // unordered_set& operator=(const unordered_set& u);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <algotithm>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines

test/std/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp

Show All 14 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_set // class unordered_set
// unordered_set& operator=(initializer_list<value_type> il); // unordered_set& operator=(initializer_list<value_type> il);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines

test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp

Show All 14 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_set // class unordered_set
// unordered_set& operator=(unordered_set&& u); // unordered_set& operator=(unordered_set&& u);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 183 Lines • Show Last 20 Lines

test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp

Show All 14 Lines
// class Alloc = allocator<Value>> // class Alloc = allocator<Value>>
// class unordered_set // class unordered_set
// unordered_set(initializer_list<value_type> il); // unordered_set(initializer_list<value_type> il);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines

test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp

Show All 13 Lines
// class unordered_set // class unordered_set
// template <class InputIterator> // template <class InputIterator>
// unordered_set(InputIterator first, InputIterator last); // unordered_set(InputIterator first, InputIterator last);
#include <unordered_set> #include <unordered_set>
#include <cassert> #include <cassert>
#include <cfloat> #include <cfloat>
#include <cmath>
#include <cstddef> #include <cstddef>
#include "test_macros.h" #include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#include "../../../test_compare.h" #include "../../../test_compare.h"
#include "../../../test_hash.h" #include "../../../test_hash.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
▲ Show 20 Lines • Show All 141 Lines • Show Last 20 Lines