diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp index 38089200e4d..f02e24b2414 100644 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp +++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp @@ -49,7 +49,7 @@ int CountAssign::moved = 0; int main() { { - typedef std::pair<std::unique_ptr<int>, short> P; + typedef std::pair<std::unique_ptr<int>, int> P; P p1(std::unique_ptr<int>(new int(3)), 4); P p2; p2 = std::move(p1); diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp index 715b6553776..d2cb6b10984 100644 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp +++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp @@ -57,7 +57,7 @@ struct ImplicitT { int main() { { - typedef std::pair<int, short> P1; + typedef std::pair<int, int> P1; typedef std::pair<double, long> P2; const P1 p1(3, 4); const P2 p2 = p1; @@ -154,7 +154,7 @@ int main() } #if TEST_STD_VER > 11 { - typedef std::pair<int, short> P1; + typedef std::pair<int, int> P1; typedef std::pair<double, long> P2; constexpr P1 p1(3, 4); constexpr P2 p2 = p1; diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp index f5d3bb621de..7e40bed2182 100644 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp +++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp @@ -67,7 +67,7 @@ struct ImplicitT { int main() { { - typedef std::pair<std::unique_ptr<Derived>, short> P1; + typedef std::pair<std::unique_ptr<Derived>, int> P1; typedef std::pair<std::unique_ptr<Base>, long> P2; P1 p1(std::unique_ptr<Derived>(), 4); P2 p2 = std::move(p1); |
