diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2009-11-23 21:34:40 -0200 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-11-24 15:29:32 -0300 |
| commit | e243cc91579f8df5e51518a5cfae75cc995d39ec (patch) | |
| tree | 936853bfd41944b4d1f92860c2b42cb61d00fc83 /ext | |
| parent | 982db27e691d4df0276b7e9fbfa471f53c8647a3 (diff) | |
Fix location of tr1's hash functions and namespace on msvc.
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/sparsehash/google/sparsehash/sparseconfig.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/ext/sparsehash/google/sparsehash/sparseconfig.h b/ext/sparsehash/google/sparsehash/sparseconfig.h index 29e0bf867..d86a2bb7a 100644 --- a/ext/sparsehash/google/sparsehash/sparseconfig.h +++ b/ext/sparsehash/google/sparsehash/sparseconfig.h @@ -6,18 +6,25 @@ /* Namespace for Google classes */ #define GOOGLE_NAMESPACE ::google -/* the location of the header defining hash functions */ -#define HASH_FUN_H <tr1/functional> - -/* the namespace of the hash<> function */ -#define HASH_NAMESPACE std::tr1 +#ifdef _WIN32 + /* the location of the header defining hash functions */ + #define HASH_FUN_H <hash_map> + /* the namespace of the hash<> function */ + #define HASH_NAMESPACE stdext + /* The system-provided hash function including the namespace. */ + #define SPARSEHASH_HASH HASH_NAMESPACE::hash_compare +#else + /* the location of the header defining hash functions */ + #define HASH_FUN_H <tr1/functional> + /* the namespace of the hash<> function */ + #define HASH_NAMESPACE std::tr1 + /* The system-provided hash function including the namespace. */ + #define SPARSEHASH_HASH HASH_NAMESPACE::hash +#endif /* Define to 1 if the system has the type `long long'. */ #define HAVE_LONG_LONG 1 -/* The system-provided hash function including the namespace. */ -#define SPARSEHASH_HASH HASH_NAMESPACE::hash - /* the namespace where STL code like vector<> is defined */ #define STL_NAMESPACE std |