[Cmake-commits] CMake branch, master, updated. v2.8.5-144-g867c3dc

KWSys Robot kwrobot at kitware.com
Mon Aug 8 08:50:11 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  867c3dcd245790553635c7fd8e3faaed6fbc0fb8 (commit)
      from  0e28009184cdb3ff375bc49142726afaa001ddeb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=867c3dcd245790553635c7fd8e3faaed6fbc0fb8
commit 867c3dcd245790553635c7fd8e3faaed6fbc0fb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 8 08:48:18 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 8 08:50:07 2011 -0400

    KWSys: Fix using long long and __int64 with hash_(set|map)
    
    Added hash function for types long long and __int64, conditional on
    detection by FundamentalType.
    
    Author: Bradley Lowekamp <blowekamp at mail.nih.gov>
    Change-Id: Ie273f55cd4387ca3dbbe00b9d96ad4935e456c9e

diff --git a/Source/kwsys/hash_fun.hxx.in b/Source/kwsys/hash_fun.hxx.in
index f21efc5..9a9cf47 100644
--- a/Source/kwsys/hash_fun.hxx.in
+++ b/Source/kwsys/hash_fun.hxx.in
@@ -38,7 +38,7 @@
 #define @KWSYS_NAMESPACE at _hash_fun_hxx
 
 #include <@KWSYS_NAMESPACE@/Configure.hxx>
-
+#include <@KWSYS_NAMESPACE@/FundamentalType.h>
 #include <@KWSYS_NAMESPACE@/cstddef>        // size_t
 
 namespace @KWSYS_NAMESPACE@
@@ -110,6 +110,29 @@ struct hash<unsigned long> {
   size_t operator()(unsigned long __x) const { return __x; }
 };
 
+#if @KWSYS_NAMESPACE at _USE_LONG_LONG
+ at KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<long long> {
+  size_t operator()(long long __x) const { return __x; }
+};
+
+ at KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<unsigned long long> {
+  size_t operator()(unsigned long long __x) const { return __x; }
+};
+#endif
+
+#if @KWSYS_NAMESPACE at _USE___INT64
+ at KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<__int64> {
+  size_t operator()(__int64 __x) const { return __x; }
+};
+ at KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<unsigned __int64> {
+  size_t operator()(unsigned __int64 __x) const { return __x; }
+};
+#endif
+
 } // namespace @KWSYS_NAMESPACE@
 
 #endif

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/hash_fun.hxx.in |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list