diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /common/func.h | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'common/func.h')
| -rw-r--r-- | common/func.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/func.h b/common/func.h index fa8f0d2151..95df96123a 100644 --- a/common/func.h +++ b/common/func.h @@ -279,13 +279,13 @@ private: * Base template for hash functor objects, used by HashMap. * This needs to be specialized for every type that you need to hash. */ -template <typename T> struct Hash; +template<typename T> struct Hash; #define GENERATE_TRIVIAL_HASH_FUNCTOR(T) \ - template <> struct Hash<T> : public UnaryFunction<T, uint> { \ - uint operator()(T val) const { return (uint)val; } \ - } + template<> struct Hash<T> : public UnaryFunction<T, uint> { \ + uint operator()(T val) const { return (uint)val; } \ + } GENERATE_TRIVIAL_HASH_FUNCTOR(bool); GENERATE_TRIVIAL_HASH_FUNCTOR(char); |