mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

functional/hash/hash.hpp インクルードガードのエラー修正

Browse source 
hash クラスの実装をデフォルトで提供
functional/hash/string.hpp テンプレートパラメータのエラー修正
This commit is contained in:
bolero-MURAKAMI 2011-10-29 11:05:42 +09:00
parent 41916cf0a5
commit 9d7eecc585
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sprout/functional/hash/hash.hpp
View file

@ -1,5 +1,5 @@
#ifndef SPROUT_FUNCTIONAL_HASH_HPP #ifndef SPROUT_FUNCTIONAL_HASH_HASH_HPP
#define SPROUT_FUNCTIONAL_HASH_HPP #define SPROUT_FUNCTIONAL_HASH_HASH_HPP
#include <cstddef> #include <cstddef>
#include <limits> #include <limits>
@ -168,6 +168,21 @@ namespace sprout {
; ;
} }
//
// hash
//
template<typename T>
struct hash {
public:
typedef T argument_type;
typedef std::size_t result_type;
public:
SPROUT_CONSTEXPR std::size_t operator()(T const& v) const {
using sprout::hash_value;
return hash_value(v);
}
};
#define SPROUT_HASH_SPECIALIZE(type) \ #define SPROUT_HASH_SPECIALIZE(type) \
template<> \ template<> \
struct hash<type> { \ struct hash<type> { \
@ -191,9 +206,6 @@ namespace sprout {
} \ } \
} }
//
// hash
//
SPROUT_HASH_SPECIALIZE(bool); SPROUT_HASH_SPECIALIZE(bool);
SPROUT_HASH_SPECIALIZE(char); SPROUT_HASH_SPECIALIZE(char);
SPROUT_HASH_SPECIALIZE(wchar_t); SPROUT_HASH_SPECIALIZE(wchar_t);
@ -211,17 +223,18 @@ namespace sprout {
#undef SPROUT_HASH_SPECIALIZE #undef SPROUT_HASH_SPECIALIZE
#undef SPROUT_HASH_SPECIALIZE_REF #undef SPROUT_HASH_SPECIALIZE_REF
template <class T> template<typename T>
struct hash<T*> { struct hash<T*> {
public: public:
typedef T* argument_type; typedef T* argument_type;
typedef std::size_t result_type; typedef std::size_t result_type;
public: public:
SPROUT_CONSTEXPR std::size_t operator()(T* v) const { SPROUT_CONSTEXPR std::size_t operator()(T* v) const {
return sprout::hash_value(v); using sprout::hash_value;
return hash_value(v);
} }
}; };
} //namespace sprout } //namespace sprout
#endif // #ifndef SPROUT_FUNCTIONAL_HASH_HPP #endif // #ifndef SPROUT_FUNCTIONAL_HASH_HASH_HPP

2
sprout/functional/hash/string.hpp
View file

@ -7,7 +7,7 @@
#include <sprout/string.hpp> #include <sprout/string.hpp>
namespace sprout { namespace sprout {
template<typename T, std::size_t N, typename Traits = sprout::char_traits<T> > template<typename T, std::size_t N, typename Traits>
SPROUT_CONSTEXPR std::size_t hash_value(sprout::basic_string<T, N, Traits> const& v) { SPROUT_CONSTEXPR std::size_t hash_value(sprout::basic_string<T, N, Traits> const& v) {
return sprout::hash_range(v.begin(), v.end()); return sprout::hash_range(v.begin(), v.end());
} }