aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2010-09-19 08:52:50 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-09-19 08:52:50 +0000
commit61e60481d004f39c8bc5497e9ca1f5893658f3d1 (patch)
tree55910f596bc49b0119b74a5801d044f2fe7126cc
parent1f77459495de551658e931294a4bf232b170078d (diff)
downloadgcc-61e60481d004f39c8bc5497e9ca1f5893658f3d1.zip
gcc-61e60481d004f39c8bc5497e9ca1f5893658f3d1.tar.gz
gcc-61e60481d004f39c8bc5497e9ca1f5893658f3d1.tar.bz2
hash_bytes.cc: Compile load_bytes and shift_mix only when __SIZEOF_SIZE_T__ == 8.
2010-09-19 Paolo Carlini <paolo.carlini@oracle.com> * src/hash_bytes.cc: Compile load_bytes and shift_mix only when __SIZEOF_SIZE_T__ == 8. From-SVN: r164410
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/hash_bytes.cc2
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f74e54f..d50afd3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-19 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * src/hash_bytes.cc: Compile load_bytes and shift_mix only when
+ __SIZEOF_SIZE_T__ == 8.
+
2010-09-17 Luc Hermitte <hermitte@free.fr>
Paolo Carlini <paolo.carlini@oracle.com>
diff --git a/libstdc++-v3/src/hash_bytes.cc b/libstdc++-v3/src/hash_bytes.cc
index 5dfa1ee..d14ad41 100644
--- a/libstdc++-v3/src/hash_bytes.cc
+++ b/libstdc++-v3/src/hash_bytes.cc
@@ -45,6 +45,7 @@ namespace
return result;
}
+#if __SIZEOF_SIZE_T__ == 8
// Loads n bytes, where 1 <= n < 8.
inline std::size_t
load_bytes(const char* p, int n)
@@ -60,6 +61,7 @@ namespace
inline std::size_t
shift_mix(std::size_t v)
{ return v ^ (v >> 47);}
+#endif
}
namespace std