summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/hash_fun.hxx.in
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-05-02 12:46:10 (GMT)
committerBrad King <brad.king@kitware.com>2012-05-02 12:46:10 (GMT)
commit221b5b697734dec909964bdba50c2e7004184539 (patch)
treecb2052078241ec50d837626b3936fd4fef95ada2 /Source/kwsys/hash_fun.hxx.in
parent3817314e2a7d83b70a8d0ced189781f676db844c (diff)
downloadCMake-221b5b697734dec909964bdba50c2e7004184539.zip
CMake-221b5b697734dec909964bdba50c2e7004184539.tar.gz
CMake-221b5b697734dec909964bdba50c2e7004184539.tar.bz2
KWSys: Remove dependencies on FundamentalType
The hash_fun.hxx header is configured whether FundamentalType is enabled or not and so cannot depend on it. Run the relevant platform tests whether or not FundamentalType is on and configure the result directly into hash_fun. While at it, remove the dependence of SystemInformation on FundamentalType too since it needs only information that we now always compute.
Diffstat (limited to 'Source/kwsys/hash_fun.hxx.in')
-rw-r--r--Source/kwsys/hash_fun.hxx.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/kwsys/hash_fun.hxx.in b/Source/kwsys/hash_fun.hxx.in
index 8c5eb6a..6f787dd 100644
--- a/Source/kwsys/hash_fun.hxx.in
+++ b/Source/kwsys/hash_fun.hxx.in
@@ -38,7 +38,6 @@
#define @KWSYS_NAMESPACE@_hash_fun_hxx
#include <@KWSYS_NAMESPACE@/Configure.hxx>
-#include <@KWSYS_NAMESPACE@/FundamentalType.h>
#include <@KWSYS_NAMESPACE@/cstddef> // size_t
#include <@KWSYS_NAMESPACE@/stl/string> // string
@@ -124,7 +123,7 @@ struct hash<unsigned long> {
};
// use long long or __int64
-#if @KWSYS_NAMESPACE@_USE_LONG_LONG
+#if @KWSYS_USE_LONG_LONG@
@KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
struct hash<long long> {
size_t operator()(long long __x) const { return __x; }
@@ -134,7 +133,7 @@ struct hash<long long> {
struct hash<unsigned long long> {
size_t operator()(unsigned long long __x) const { return __x; }
};
-#elif @KWSYS_NAMESPACE@_USE___INT64
+#elif @KWSYS_USE___INT64@
@KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
struct hash<__int64> {
size_t operator()(__int64 __x) const { return __x; }