[Boost-commit] svn:boost r62290 - in sandbox/hash: boost/hash/block_cyphers boost/hash/block_cyphers/detail boost/hash/detail libs/hash/test

Subject: [Boost-commit] svn:boost r62290 - in sandbox/hash: boost/hash/block_cyphers boost/hash/block_cyphers/detail boost/hash/detail libs/hash/test
From: me22.ca+boost_at_[hidden]
Date: 2010-05-27 23:52:42

Author: smcmurray
Date: 2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
New Revision: 62290
URL: http://svn.boost.org/trac/boost/changeset/62290

Log:
hash: wrap large constants in the appropriate integer/cstdint.hpp macros
Text files modified: 
   sandbox/hash/boost/hash/block_cyphers/detail/shacal2_policy.hpp |    90 +++++++++++++++--------------           
   sandbox/hash/boost/hash/block_cyphers/threefish.hpp             |     4 +                                       
   sandbox/hash/boost/hash/detail/sha2_policy.hpp                  |    18 +++--                                   
   sandbox/hash/libs/hash/test/adler.cpp                           |     2                                         
   sandbox/hash/libs/hash/test/sha2.cpp                            |    76 ++++++++++++------------                
   sandbox/hash/libs/hash/test/threefish.cpp                       |   118 ++++++++++++++++++++--------------------
   6 files changed, 157 insertions(+), 151 deletions(-)

Modified: sandbox/hash/boost/hash/block_cyphers/detail/shacal2_policy.hpp
==============================================================================
--- sandbox/hash/boost/hash/block_cyphers/detail/shacal2_policy.hpp	(original)
+++ sandbox/hash/boost/hash/block_cyphers/detail/shacal2_policy.hpp	2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
@@ -12,6 +12,8 @@
 #include <boost/array.hpp>
 #include <boost/hash/block_cyphers/detail/shacal_functions.hpp>
 
+#include <boost/cstdint.hpp>
+
 namespace boost {
 namespace hash {
 namespace block_cyphers {
@@ -79,50 +81,50 @@
 
     static word_type constant(unsigned t) {
         static constants_type const constants = {{
-            0x428a2f98d728ae22, 0x7137449123ef65cd,
-            0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc,
-            0x3956c25bf348b538, 0x59f111f1b605d019,
-            0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
-            0xd807aa98a3030242, 0x12835b0145706fbe,
-            0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
-            0x72be5d74f27b896f, 0x80deb1fe3b1696b1,
-            0x9bdc06a725c71235, 0xc19bf174cf692694,
-
-            0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
-            0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
-            0x2de92c6f592b0275, 0x4a7484aa6ea6e483,
-            0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
-            0x983e5152ee66dfab, 0xa831c66d2db43210,
-            0xb00327c898fb213f, 0xbf597fc7beef0ee4,
-            0xc6e00bf33da88fc2, 0xd5a79147930aa725,
-            0x06ca6351e003826f, 0x142929670a0e6e70,
-
-            0x27b70a8546d22ffc, 0x2e1b21385c26c926,
-            0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
-            0x650a73548baf63de, 0x766a0abb3c77b2a8,
-            0x81c2c92e47edaee6, 0x92722c851482353b,
-            0xa2bfe8a14cf10364, 0xa81a664bbc423001,
-            0xc24b8b70d0f89791, 0xc76c51a30654be30,
-            0xd192e819d6ef5218, 0xd69906245565a910,
-            0xf40e35855771202a, 0x106aa07032bbd1b8,
-
-            0x19a4c116b8d2d0c8, 0x1e376c085141ab53,
-            0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8,
-            0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb,
-            0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3,
-            0x748f82ee5defb2fc, 0x78a5636f43172f60,
-            0x84c87814a1f0ab72, 0x8cc702081a6439ec,
-            0x90befffa23631e28, 0xa4506cebde82bde9,
-            0xbef9a3f7b2c67915, 0xc67178f2e372532b,
-
-            0xca273eceea26619c, 0xd186b8c721c0c207,
-            0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
-            0x06f067aa72176fba, 0x0a637dc5a2c898a6,
-            0x113f9804bef90dae, 0x1b710b35131c471b,
-            0x28db77f523047d84, 0x32caab7b40c72493,
-            0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c,
-            0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
-            0x5fcb6fab3ad6faec, 0x6c44198c4a475817,
+            UINT64_C(0x428a2f98d728ae22), UINT64_C(0x7137449123ef65cd),
+            UINT64_C(0xb5c0fbcfec4d3b2f), UINT64_C(0xe9b5dba58189dbbc),
+            UINT64_C(0x3956c25bf348b538), UINT64_C(0x59f111f1b605d019),
+            UINT64_C(0x923f82a4af194f9b), UINT64_C(0xab1c5ed5da6d8118),
+            UINT64_C(0xd807aa98a3030242), UINT64_C(0x12835b0145706fbe),
+            UINT64_C(0x243185be4ee4b28c), UINT64_C(0x550c7dc3d5ffb4e2),
+            UINT64_C(0x72be5d74f27b896f), UINT64_C(0x80deb1fe3b1696b1),
+            UINT64_C(0x9bdc06a725c71235), UINT64_C(0xc19bf174cf692694),
+
+            UINT64_C(0xe49b69c19ef14ad2), UINT64_C(0xefbe4786384f25e3),
+            UINT64_C(0x0fc19dc68b8cd5b5), UINT64_C(0x240ca1cc77ac9c65),
+            UINT64_C(0x2de92c6f592b0275), UINT64_C(0x4a7484aa6ea6e483),
+            UINT64_C(0x5cb0a9dcbd41fbd4), UINT64_C(0x76f988da831153b5),
+            UINT64_C(0x983e5152ee66dfab), UINT64_C(0xa831c66d2db43210),
+            UINT64_C(0xb00327c898fb213f), UINT64_C(0xbf597fc7beef0ee4),
+            UINT64_C(0xc6e00bf33da88fc2), UINT64_C(0xd5a79147930aa725),
+            UINT64_C(0x06ca6351e003826f), UINT64_C(0x142929670a0e6e70),
+
+            UINT64_C(0x27b70a8546d22ffc), UINT64_C(0x2e1b21385c26c926),
+            UINT64_C(0x4d2c6dfc5ac42aed), UINT64_C(0x53380d139d95b3df),
+            UINT64_C(0x650a73548baf63de), UINT64_C(0x766a0abb3c77b2a8),
+            UINT64_C(0x81c2c92e47edaee6), UINT64_C(0x92722c851482353b),
+            UINT64_C(0xa2bfe8a14cf10364), UINT64_C(0xa81a664bbc423001),
+            UINT64_C(0xc24b8b70d0f89791), UINT64_C(0xc76c51a30654be30),
+            UINT64_C(0xd192e819d6ef5218), UINT64_C(0xd69906245565a910),
+            UINT64_C(0xf40e35855771202a), UINT64_C(0x106aa07032bbd1b8),
+
+            UINT64_C(0x19a4c116b8d2d0c8), UINT64_C(0x1e376c085141ab53),
+            UINT64_C(0x2748774cdf8eeb99), UINT64_C(0x34b0bcb5e19b48a8),
+            UINT64_C(0x391c0cb3c5c95a63), UINT64_C(0x4ed8aa4ae3418acb),
+            UINT64_C(0x5b9cca4f7763e373), UINT64_C(0x682e6ff3d6b2b8a3),
+            UINT64_C(0x748f82ee5defb2fc), UINT64_C(0x78a5636f43172f60),
+            UINT64_C(0x84c87814a1f0ab72), UINT64_C(0x8cc702081a6439ec),
+            UINT64_C(0x90befffa23631e28), UINT64_C(0xa4506cebde82bde9),
+            UINT64_C(0xbef9a3f7b2c67915), UINT64_C(0xc67178f2e372532b),
+
+            UINT64_C(0xca273eceea26619c), UINT64_C(0xd186b8c721c0c207),
+            UINT64_C(0xeada7dd6cde0eb1e), UINT64_C(0xf57d4f7fee6ed178),
+            UINT64_C(0x06f067aa72176fba), UINT64_C(0x0a637dc5a2c898a6),
+            UINT64_C(0x113f9804bef90dae), UINT64_C(0x1b710b35131c471b),
+            UINT64_C(0x28db77f523047d84), UINT64_C(0x32caab7b40c72493),
+            UINT64_C(0x3c9ebe0a15c9bebc), UINT64_C(0x431d67c49c100d4c),
+            UINT64_C(0x4cc5d4becb3e42b6), UINT64_C(0x597f299cfc657e2a),
+            UINT64_C(0x5fcb6fab3ad6faec), UINT64_C(0x6c44198c4a475817),
         }};
         return constants[t];
     }

Modified: sandbox/hash/boost/hash/block_cyphers/threefish.hpp
==============================================================================
--- sandbox/hash/boost/hash/block_cyphers/threefish.hpp	(original)
+++ sandbox/hash/boost/hash/block_cyphers/threefish.hpp	2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
@@ -11,6 +11,8 @@
 
 #include <boost/hash/block_cyphers/detail/threefish_policy.hpp>
 
+#include <boost/cstdint.hpp>
+
 #ifdef BOOST_HASH_SHOW_PROGRESS
 #include <cstdio>
 #endif
@@ -70,7 +72,7 @@
   private:
     void
     set_key(key_type const &key) {
-        word_type k_N_w = 0x5555555555555555L;
+        word_type k_N_w = UINT64_C(0x5555555555555555);
         for (unsigned t = 0; t < key_words; ++t) {
             key_schedule[t] = key[t];
 #ifdef BOOST_HASH_SHOW_PROGRESS

Modified: sandbox/hash/boost/hash/detail/sha2_policy.hpp
==============================================================================
--- sandbox/hash/boost/hash/detail/sha2_policy.hpp	(original)
+++ sandbox/hash/boost/hash/detail/sha2_policy.hpp	2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
@@ -12,6 +12,8 @@
 #include <boost/hash/block_cyphers/detail/shacal2_policy.hpp>
 #include <boost/hash/digest.hpp>
 
+#include <boost/cstdint.hpp>
+
 namespace boost {
 namespace hash {
 namespace detail {
@@ -77,10 +79,10 @@
         state_type const &
         operator()() const {
             static state_type const H0 = {{
-                0xcbbb9d5dc1059ed8L, 0x629a292a367cd507L,
-                0x9159015a3070dd17L, 0x152fecd8f70e5939L,
-                0x67332667ffc00b31L, 0x8eb44a8768581511L,
-                0xdb0c2e0d64f98fa7L, 0x47b5481dbefa4fa4L,
+                UINT64_C(0xcbbb9d5dc1059ed8), UINT64_C(0x629a292a367cd507),
+                UINT64_C(0x9159015a3070dd17), UINT64_C(0x152fecd8f70e5939),
+                UINT64_C(0x67332667ffc00b31), UINT64_C(0x8eb44a8768581511),
+                UINT64_C(0xdb0c2e0d64f98fa7), UINT64_C(0x47b5481dbefa4fa4),
             }};
             return H0;
         }
@@ -98,10 +100,10 @@
         state_type const &
         operator()() const {
             static state_type const H0 = {{
-                0x6a09e667f3bcc908L, 0xbb67ae8584caa73bL,
-                0x3c6ef372fe94f82bL, 0xa54ff53a5f1d36f1L,
-                0x510e527fade682d1L, 0x9b05688c2b3e6c1fL,
-                0x1f83d9abfb41bd6bL, 0x5be0cd19137e2179L,
+                UINT64_C(0x6a09e667f3bcc908), UINT64_C(0xbb67ae8584caa73b),
+                UINT64_C(0x3c6ef372fe94f82b), UINT64_C(0xa54ff53a5f1d36f1),
+                UINT64_C(0x510e527fade682d1), UINT64_C(0x9b05688c2b3e6c1f),
+                UINT64_C(0x1f83d9abfb41bd6b), UINT64_C(0x5be0cd19137e2179),
             }};
             return H0;
         }

Modified: sandbox/hash/libs/hash/test/adler.cpp
==============================================================================
--- sandbox/hash/libs/hash/test/adler.cpp	(original)
+++ sandbox/hash/libs/hash/test/adler.cpp	2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
@@ -44,7 +44,7 @@
     BOOST_STATIC_ASSERT(largest_prime<29>::value == 536870909);
     BOOST_STATIC_ASSERT(largest_prime<30>::value == 1073741789);
     BOOST_STATIC_ASSERT(largest_prime<31>::value == 2147483647);
-    BOOST_STATIC_ASSERT(largest_prime<32>::value == 4294967291);
+    BOOST_STATIC_ASSERT(largest_prime<32>::value == 4294967291U);
 
 }
 

Modified: sandbox/hash/libs/hash/test/sha2.cpp
==============================================================================
--- sandbox/hash/libs/hash/test/sha2.cpp	(original)
+++ sandbox/hash/libs/hash/test/sha2.cpp	2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
@@ -154,7 +154,7 @@
     // A single 1 bit after the (empty) message,
     // then pad with 0s,
     // then add the length, which is also 0
-    HASH::block_hash_type::block_type m = {{0x8000000000000000ul}};
+    HASH::block_hash_type::block_type m = {{UINT64_C(0x8000000000000000)}};
     a.update(m);
 
     HASH::digest_type s = a.end_message();
@@ -167,8 +167,8 @@
     {
     // Example from appendix D.1: echo -n "abc" | sha384sum
     HASH::block_hash_type::block_type m = {{}};
-    m[ 0] = 0x6162638000000000L;
-    m[15] = 0x0000000000000018L;
+    m[ 0] = UINT64_C(0x6162638000000000);
+    m[15] = UINT64_C(0x0000000000000018);
     a.update(m);
 
     HASH::digest_type s = a.end_message();
@@ -183,22 +183,22 @@
     // echo -n "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn (continues)
     //          hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" | sha384sum
     HASH::block_hash_type::block_type m1 = {{
-        0x6162636465666768L,
-        0x6263646566676869L,
-        0x636465666768696aL,
-        0x6465666768696a6bL,
-        0x65666768696a6b6cL,
-        0x666768696a6b6c6dL,
-        0x6768696a6b6c6d6eL,
-        0x68696a6b6c6d6e6fL,
-        0x696a6b6c6d6e6f70L,
-        0x6a6b6c6d6e6f7071L,
-        0x6b6c6d6e6f707172L,
-        0x6c6d6e6f70717273L,
-        0x6d6e6f7071727374L,
-        0x6e6f707172737475L,
-        0x8000000000000000L,
-        0x0000000000000000L,
+        UINT64_C(0x6162636465666768),
+        UINT64_C(0x6263646566676869),
+        UINT64_C(0x636465666768696a),
+        UINT64_C(0x6465666768696a6b),
+        UINT64_C(0x65666768696a6b6c),
+        UINT64_C(0x666768696a6b6c6d),
+        UINT64_C(0x6768696a6b6c6d6e),
+        UINT64_C(0x68696a6b6c6d6e6f),
+        UINT64_C(0x696a6b6c6d6e6f70),
+        UINT64_C(0x6a6b6c6d6e6f7071),
+        UINT64_C(0x6b6c6d6e6f707172),
+        UINT64_C(0x6c6d6e6f70717273),
+        UINT64_C(0x6d6e6f7071727374),
+        UINT64_C(0x6e6f707172737475),
+        UINT64_C(0x8000000000000000),
+        UINT64_C(0x0000000000000000),
     }};
     a.update(m1);
     assert("2a7f1d895fd58e0beaae96d1a673c741015a2173796c1a88"
@@ -229,7 +229,7 @@
     // A single 1 bit after the (empty) message,
     // then pad with 0s,
     // then add the length, which is also 0
-    HASH::block_hash_type::block_type m = {{0x8000000000000000ul}};
+    HASH::block_hash_type::block_type m = {{UINT64_C(0x8000000000000000)}};
     a.update(m);
 
     HASH::digest_type s = a.end_message();
@@ -242,8 +242,8 @@
     {
     // Example from appendix C.1: echo -n "abc" | sha512sum
     HASH::block_hash_type::block_type m = {{}};
-    m[ 0] = 0x6162638000000000L;
-    m[15] = 0x0000000000000018L;
+    m[ 0] = UINT64_C(0x6162638000000000);
+    m[15] = UINT64_C(0x0000000000000018);
     a.update(m);
 
     HASH::digest_type s = a.end_message();
@@ -258,22 +258,22 @@
     // echo -n "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn (continues)
     //          hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" | sha512sum
     HASH::block_hash_type::block_type m1 = {{
-        0x6162636465666768L,
-        0x6263646566676869L,
-        0x636465666768696aL,
-        0x6465666768696a6bL,
-        0x65666768696a6b6cL,
-        0x666768696a6b6c6dL,
-        0x6768696a6b6c6d6eL,
-        0x68696a6b6c6d6e6fL,
-        0x696a6b6c6d6e6f70L,
-        0x6a6b6c6d6e6f7071L,
-        0x6b6c6d6e6f707172L,
-        0x6c6d6e6f70717273L,
-        0x6d6e6f7071727374L,
-        0x6e6f707172737475L,
-        0x8000000000000000L,
-        0x0000000000000000L,
+        UINT64_C(0x6162636465666768),
+        UINT64_C(0x6263646566676869),
+        UINT64_C(0x636465666768696a),
+        UINT64_C(0x6465666768696a6b),
+        UINT64_C(0x65666768696a6b6c),
+        UINT64_C(0x666768696a6b6c6d),
+        UINT64_C(0x6768696a6b6c6d6e),
+        UINT64_C(0x68696a6b6c6d6e6f),
+        UINT64_C(0x696a6b6c6d6e6f70),
+        UINT64_C(0x6a6b6c6d6e6f7071),
+        UINT64_C(0x6b6c6d6e6f707172),
+        UINT64_C(0x6c6d6e6f70717273),
+        UINT64_C(0x6d6e6f7071727374),
+        UINT64_C(0x6e6f707172737475),
+        UINT64_C(0x8000000000000000),
+        UINT64_C(0x0000000000000000),
     }};
     a.update(m1);
     assert("4319017a2b706e69cd4b05938bae5e890186bf199f30aa956ef8b71d2f810585"

Modified: sandbox/hash/libs/hash/test/threefish.cpp
==============================================================================
--- sandbox/hash/libs/hash/test/threefish.cpp	(original)
+++ sandbox/hash/libs/hash/test/threefish.cpp	2010-05-27 23:52:38 EDT (Thu, 27 May 2010)
@@ -46,24 +46,24 @@
 
     {
     tweak_type t = {{
-        0x0706050403020100, 0x0F0E0D0C0B0A0908,
+        UINT64_C(0x0706050403020100), UINT64_C(0x0F0E0D0C0B0A0908),
     }};
     key_type k = {{
-        0x1716151413121110, 0x1F1E1D1C1B1A1918,
-        0x2726252423222120, 0x2F2E2D2C2B2A2928,
+        UINT64_C(0x1716151413121110), UINT64_C(0x1F1E1D1C1B1A1918),
+        UINT64_C(0x2726252423222120), UINT64_C(0x2F2E2D2C2B2A2928),
     }};
     cypher_type c(k, t);
     block_type pt = {{
-        0xF8F9FAFBFCFDFEFF, 0xF0F1F2F3F4F5F6F7,
-        0xE8E9EAEBECEDEEEF, 0xE0E1E2E3E4E5E6E7,
+        UINT64_C(0xF8F9FAFBFCFDFEFF), UINT64_C(0xF0F1F2F3F4F5F6F7),
+        UINT64_C(0xE8E9EAEBECEDEEEF), UINT64_C(0xE0E1E2E3E4E5E6E7),
     }};
     block_type ect = {{
 #ifdef BOOST_HASH_THREEFISH_OLD_ROTATION_CONSTANTS
-        0x1195ED1B648F9B1E, 0xA1D7C357DF404FBE,
-        0x13F77ADD8E7142BC, 0xF820A9B2524C3D9B,
+        UINT64_C(0x1195ED1B648F9B1E), UINT64_C(0xA1D7C357DF404FBE),
+        UINT64_C(0x13F77ADD8E7142BC), UINT64_C(0xF820A9B2524C3D9B),
 #else
-        0xD5DB258C5003E2CA, 0x697BDA64B7B1E9D6,
-        0x95FBB82D65D41C2E, 0x8EF81E6E74516247,
+        UINT64_C(0xD5DB258C5003E2CA), UINT64_C(0x697BDA64B7B1E9D6),
+        UINT64_C(0x95FBB82D65D41C2E), UINT64_C(0x8EF81E6E74516247),
 #endif
     }};
     block_type ct = c.encypher(pt);
@@ -99,32 +99,32 @@
 
     {
     tweak_type t = {{
-        0x0706050403020100, 0x0F0E0D0C0B0A0908,
+        UINT64_C(0x0706050403020100), UINT64_C(0x0F0E0D0C0B0A0908),
     }};
     key_type k = {{
-        0x1716151413121110, 0x1F1E1D1C1B1A1918,
-        0x2726252423222120, 0x2F2E2D2C2B2A2928,
-        0x3736353433323130, 0x3F3E3D3C3B3A3938,
-        0x4746454443424140, 0x4F4E4D4C4B4A4948,
+        UINT64_C(0x1716151413121110), UINT64_C(0x1F1E1D1C1B1A1918),
+        UINT64_C(0x2726252423222120), UINT64_C(0x2F2E2D2C2B2A2928),
+        UINT64_C(0x3736353433323130), UINT64_C(0x3F3E3D3C3B3A3938),
+        UINT64_C(0x4746454443424140), UINT64_C(0x4F4E4D4C4B4A4948),
     }};
     cypher_type c(k, t);
     block_type pt = {{
-        0xF8F9FAFBFCFDFEFF, 0xF0F1F2F3F4F5F6F7,
-        0xE8E9EAEBECEDEEEF, 0xE0E1E2E3E4E5E6E7,
-        0xD8D9DADBDCDDDEDF, 0xD0D1D2D3D4D5D6D7,
-        0xC8C9CACBCCCDCECF, 0xC0C1C2C3C4C5C6C7,
+        UINT64_C(0xF8F9FAFBFCFDFEFF), UINT64_C(0xF0F1F2F3F4F5F6F7),
+        UINT64_C(0xE8E9EAEBECEDEEEF), UINT64_C(0xE0E1E2E3E4E5E6E7),
+        UINT64_C(0xD8D9DADBDCDDDEDF), UINT64_C(0xD0D1D2D3D4D5D6D7),
+        UINT64_C(0xC8C9CACBCCCDCECF), UINT64_C(0xC0C1C2C3C4C5C6C7),
     }};
     block_type ect = {{
 #ifdef BOOST_HASH_THREEFISH_OLD_ROTATION_CONSTANTS
-        0x3B1DE51022E19A86, 0x0D40CB2A9F393607,
-        0x1D2FE6130B6030E2, 0x81D23262146A59F7,
-        0x9A1B57657A12BFDF, 0x94836719C7068979,
-        0xF283FD3851990DC5, 0xF0D250C33B4AA5BF,
+        UINT64_C(0x3B1DE51022E19A86), UINT64_C(0x0D40CB2A9F393607),
+        UINT64_C(0x1D2FE6130B6030E2), UINT64_C(0x81D23262146A59F7),
+        UINT64_C(0x9A1B57657A12BFDF), UINT64_C(0x94836719C7068979),
+        UINT64_C(0xF283FD3851990DC5), UINT64_C(0xF0D250C33B4AA5BF),
 #else
-        0x5D6EF7FC78E90D95, 0xF6E6216619FDADAD,
-        0x19C009C55B0CC7D5, 0xA0281898E0A4F8DD,
-        0x841567AB57477CBD, 0x1836BC7C0D6C128D,
-        0xA10377C64EDD1AE8, 0xAE51F0177E206DF2,
+        UINT64_C(0x5D6EF7FC78E90D95), UINT64_C(0xF6E6216619FDADAD),
+        UINT64_C(0x19C009C55B0CC7D5), UINT64_C(0xA0281898E0A4F8DD),
+        UINT64_C(0x841567AB57477CBD), UINT64_C(0x1836BC7C0D6C128D),
+        UINT64_C(0xA10377C64EDD1AE8), UINT64_C(0xAE51F0177E206DF2),
 #endif
     }};
     block_type ct = c.encypher(pt);
@@ -164,48 +164,48 @@
 
     {
     tweak_type t = {{
-        0x0706050403020100, 0x0F0E0D0C0B0A0908,
+        UINT64_C(0x0706050403020100), UINT64_C(0x0F0E0D0C0B0A0908),
     }};
     key_type k = {{
-        0x1716151413121110, 0x1F1E1D1C1B1A1918,
-        0x2726252423222120, 0x2F2E2D2C2B2A2928,
-        0x3736353433323130, 0x3F3E3D3C3B3A3938,
-        0x4746454443424140, 0x4F4E4D4C4B4A4948,
-        0x5756555453525150, 0x5F5E5D5C5B5A5958,
-        0x6766656463626160, 0x6F6E6D6C6B6A6968,
-        0x7776757473727170, 0x7F7E7D7C7B7A7978,
-        0x8786858483828180, 0x8F8E8D8C8B8A8988,
+        UINT64_C(0x1716151413121110), UINT64_C(0x1F1E1D1C1B1A1918),
+        UINT64_C(0x2726252423222120), UINT64_C(0x2F2E2D2C2B2A2928),
+        UINT64_C(0x3736353433323130), UINT64_C(0x3F3E3D3C3B3A3938),
+        UINT64_C(0x4746454443424140), UINT64_C(0x4F4E4D4C4B4A4948),
+        UINT64_C(0x5756555453525150), UINT64_C(0x5F5E5D5C5B5A5958),
+        UINT64_C(0x6766656463626160), UINT64_C(0x6F6E6D6C6B6A6968),
+        UINT64_C(0x7776757473727170), UINT64_C(0x7F7E7D7C7B7A7978),
+        UINT64_C(0x8786858483828180), UINT64_C(0x8F8E8D8C8B8A8988),
     }};
     cypher_type c(k, t);
     block_type pt = {{
-        0xF8F9FAFBFCFDFEFF, 0xF0F1F2F3F4F5F6F7,
-        0xE8E9EAEBECEDEEEF, 0xE0E1E2E3E4E5E6E7,
-        0xD8D9DADBDCDDDEDF, 0xD0D1D2D3D4D5D6D7,
-        0xC8C9CACBCCCDCECF, 0xC0C1C2C3C4C5C6C7,
-        0xB8B9BABBBCBDBEBF, 0xB0B1B2B3B4B5B6B7,
-        0xA8A9AAABACADAEAF, 0xA0A1A2A3A4A5A6A7,
-        0x98999A9B9C9D9E9F, 0x9091929394959697,
-        0x88898A8B8C8D8E8F, 0x8081828384858687,
+        UINT64_C(0xF8F9FAFBFCFDFEFF), UINT64_C(0xF0F1F2F3F4F5F6F7),
+        UINT64_C(0xE8E9EAEBECEDEEEF), UINT64_C(0xE0E1E2E3E4E5E6E7),
+        UINT64_C(0xD8D9DADBDCDDDEDF), UINT64_C(0xD0D1D2D3D4D5D6D7),
+        UINT64_C(0xC8C9CACBCCCDCECF), UINT64_C(0xC0C1C2C3C4C5C6C7),
+        UINT64_C(0xB8B9BABBBCBDBEBF), UINT64_C(0xB0B1B2B3B4B5B6B7),
+        UINT64_C(0xA8A9AAABACADAEAF), UINT64_C(0xA0A1A2A3A4A5A6A7),
+        UINT64_C(0x98999A9B9C9D9E9F), UINT64_C(0x9091929394959697),
+        UINT64_C(0x88898A8B8C8D8E8F), UINT64_C(0x8081828384858687),
     }};
     block_type ect = {{
 #ifdef BOOST_HASH_THREEFISH_OLD_ROTATION_CONSTANTS
-        0x4243AA25316BE644, 0x1C1010C3F4BEAD61,
-        0x3231B47252181DEF, 0x51282B69757EE6D6,
-        0xC6D6D3DFF8ACE3A7, 0x7E280D152427EADF,
-        0xFA71E927FFAB2B8C, 0xBFF281E11B7863C1,
-        0xF89E256248B82A57, 0x8F121DA6778A62FA,
-        0xFE928551BD17152F, 0xDA8A840D67FF8293,
-        0xC6C236CFDC8215B3, 0x3F85A234AE3A1507,
-        0xCC03C962F44CC1F0, 0xB1040CE54A736028,
+        UINT64_C(0x4243AA25316BE644), UINT64_C(0x1C1010C3F4BEAD61),
+        UINT64_C(0x3231B47252181DEF), UINT64_C(0x51282B69757EE6D6),
+        UINT64_C(0xC6D6D3DFF8ACE3A7), UINT64_C(0x7E280D152427EADF),
+        UINT64_C(0xFA71E927FFAB2B8C), UINT64_C(0xBFF281E11B7863C1),
+        UINT64_C(0xF89E256248B82A57), UINT64_C(0x8F121DA6778A62FA),
+        UINT64_C(0xFE928551BD17152F), UINT64_C(0xDA8A840D67FF8293),
+        UINT64_C(0xC6C236CFDC8215B3), UINT64_C(0x3F85A234AE3A1507),
+        UINT64_C(0xCC03C962F44CC1F0), UINT64_C(0xB1040CE54A736028),
 #else
-        0x2464AD5AB185DC77, 0xE04DC8BFD571E31C,
-        0x9CE6A73480A1915A, 0x3608792385E3FE33,
-        0x32CD1A7B3E1968F5, 0x2343B04DFCF1FF69,
-        0xB94C44202614975E, 0xA51A8C5A489F0737,
-        0x8B01DD5EF172F8DF, 0xC6527AFA44CD0CEC,
-        0xA976533327140A77, 0x1DB3AE193971D14E,
-        0xCA4A2858E912B0B7, 0x7665A8A50E6B22E5,
-        0x8127345A2CF99C4A, 0x9EF278F6CC3E417E,
+        UINT64_C(0x2464AD5AB185DC77), UINT64_C(0xE04DC8BFD571E31C),
+        UINT64_C(0x9CE6A73480A1915A), UINT64_C(0x3608792385E3FE33),
+        UINT64_C(0x32CD1A7B3E1968F5), UINT64_C(0x2343B04DFCF1FF69),
+        UINT64_C(0xB94C44202614975E), UINT64_C(0xA51A8C5A489F0737),
+        UINT64_C(0x8B01DD5EF172F8DF), UINT64_C(0xC6527AFA44CD0CEC),
+        UINT64_C(0xA976533327140A77), UINT64_C(0x1DB3AE193971D14E),
+        UINT64_C(0xCA4A2858E912B0B7), UINT64_C(0x7665A8A50E6B22E5),
+        UINT64_C(0x8127345A2CF99C4A), UINT64_C(0x9EF278F6CC3E417E),
 #endif
     }};
     block_type ct = c.encypher(pt);