boostorg/functional
1
0
Fork 1
mirror of https://github.com/boostorg/functional.git synced 2025-08-02 14:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge VC7 workaround from HEAD.

Browse Source 
[SVN r34197]
This commit is contained in:
Daniel James
2006-06-06 17:38:38 +00:00
parent 0785097bac
commit 1b625ac7ab
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/functional/hash/hash.hpp
View File

@@ -388,7 +388,7 @@ namespace boost
} }
template <class T> struct hash template <class T> struct hash
: public hash_detail::hash_impl<boost::is_pointer<T>::value> : public boost::hash_detail::hash_impl<boost::is_pointer<T>::value>
::BOOST_NESTED_TEMPLATE inner<T> ::BOOST_NESTED_TEMPLATE inner<T>
{ {
}; };
@@ -479,7 +479,7 @@ namespace boost
}; };
#endif #endif
#elif !BOOST_WORKAROUND(BOOST_MSVC, < 1300) #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
// On compilers without partial specialization, boost::hash<T> // On compilers without partial specialization, boost::hash<T>
// has already been declared to deal with pointers, so just // has already been declared to deal with pointers, so just
@@ -487,6 +487,11 @@ namespace boost
namespace hash_detail namespace hash_detail
{ {
template <bool IsPointer>
struct hash_impl;
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template <> template <>
struct hash_impl<false> struct hash_impl<false>
{ {
@@ -507,15 +512,12 @@ namespace boost
#endif #endif
}; };
}; };
}
#else // Visual C++ 6.5 #else // Visual C++ 6.5
// There's probably a more elegant way to Visual C++ 6.5 to work // There's probably a more elegant way to Visual C++ 6.5 to work
// but I don't know what it is. // but I don't know what it is.
namespace hash_detail
{
template <bool IsConst> template <bool IsConst>
struct hash_impl_msvc struct hash_impl_msvc
{ {
@@ -560,8 +562,10 @@ namespace boost
template <class T> template <class T>
struct inner : public hash_impl_msvc2<T> {}; struct inner : public hash_impl_msvc2<T> {};
}; };
#endif // Visual C++ 6.5
} }
#endif #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
} }
#endif #endif