From ec97728ba075e26743ceef5fcd1869f658892c8b Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Mon, 25 Apr 2011 16:57:21 +0900
Subject: [PATCH] test/utilities: Fix LLP64-aware.

---
 .../meta.trans.other/aligned_storage.pass.cpp        | 12 ++++++------
 .../meta/meta.unary.prop.query/alignment_of.pass.cpp |  8 ++++----
 .../template.bitset/bitset.members/to_ulong.pass.cpp |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp b/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
index 845c7620..e1ece97a 100644
--- a/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
+++ b/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
@@ -92,17 +92,17 @@ int main()
     }
     {
     typedef std::aligned_storage<8>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
+    static_assert(std::alignment_of<T1>::value == (sizeof(void*) == 4 ? 4 : 8), "");
     static_assert(sizeof(T1) == 8, "");
     }
     {
     typedef std::aligned_storage<9>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
-    static_assert(sizeof(T1) == (sizeof(long) == 4 ? 12 : 16), "");
+    static_assert(std::alignment_of<T1>::value == (sizeof(void*) == 4 ? 4 : 8), "");
+    static_assert(sizeof(T1) == (sizeof(void*) == 4 ? 12 : 16), "");
     }
     {
     typedef std::aligned_storage<15>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
+    static_assert(std::alignment_of<T1>::value == (sizeof(void*) == 4 ? 4 : 8), "");
     static_assert(sizeof(T1) == 16, "");
     }
     {
@@ -117,7 +117,7 @@ int main()
     }
     {
     typedef std::aligned_storage<10>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
-    static_assert(sizeof(T1) == (sizeof(long) == 4 ? 12 : 16), "");
+    static_assert(std::alignment_of<T1>::value == (sizeof(void*) == 4 ? 4 : 8), "");
+    static_assert(sizeof(T1) == (sizeof(void*) == 4 ? 12 : 16), "");
     }
 }
diff --git a/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp b/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
index 87c22248..fb7f4968 100644
--- a/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
+++ b/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
@@ -30,13 +30,13 @@ public:
 
 int main()
 {
-    test_alignment_of<int&, sizeof(long) == 4 ? 4 : 8>();
+    test_alignment_of<int&, sizeof(void*) == 4 ? 4 : 8>();
     test_alignment_of<Class, 1>();
-    test_alignment_of<int*, sizeof(long) == 4 ? 4 : 8>();
-    test_alignment_of<const int*, sizeof(long) == 4 ? 4 : 8>();
+    test_alignment_of<int*, sizeof(void*) == 4 ? 4 : 8>();
+    test_alignment_of<const int*, sizeof(void*) == 4 ? 4 : 8>();
     test_alignment_of<char[3], 1>();
     test_alignment_of<int, 4>();
-    test_alignment_of<double, sizeof(long) == 4 ? 4 : 8>();
+    test_alignment_of<double, sizeof(void*) == 4 ? 4 : 8>();
     test_alignment_of<bool, 1>();
     test_alignment_of<unsigned, 4>();
 }
diff --git a/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp b/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
index fa62c97a..27ca98d3 100644
--- a/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
@@ -30,7 +30,7 @@ void test_to_ulong()
                            max};
     for (std::size_t i = 0; i < sizeof(tests)/sizeof(tests[0]); ++i)
     {
-        std::size_t j = tests[i];
+        unsigned long j = tests[i];
         std::bitset<N> v(j);
         assert(j == v.to_ulong());
     }