Update of /cvsroot/boost/boost/boost/asio/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28734
Modified Files:
hash_map.hpp socket_types.hpp
Log Message:
Fix use of hash_value overloads to work on x64 with the Vista version of
the Platform SDK.
Index: hash_map.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/asio/detail/hash_map.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hash_map.hpp 4 Jan 2007 05:53:00 -0000 1.3
+++ hash_map.hpp 9 Feb 2007 06:44:12 -0000 1.4
@@ -25,6 +25,7 @@
#include <boost/asio/detail/pop_options.hpp>
#include <boost/asio/detail/noncopyable.hpp>
+#include <boost/asio/detail/socket_types.hpp>
namespace boost {
namespace asio {
@@ -33,12 +34,15 @@
template <typename T>
inline std::size_t calculate_hash_value(const T& t)
{
- // It would be better to use "using boost::hash_value;" here, but it makes
- // Borland C++ crash.
- using namespace boost;
+ return boost::hash_value(t);
+}
- return hash_value(t);
+#if defined(_WIN64)
+inline std::size_t calculate_hash_value(SOCKET s)
+{
+ return static_cast<std::size_t>(s);
}
+#endif // defined(_WIN64)
template <typename K, typename V>
class hash_map
Index: socket_types.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/asio/detail/socket_types.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- socket_types.hpp 4 Jan 2007 05:53:01 -0000 1.5
+++ socket_types.hpp 9 Feb 2007 06:44:12 -0000 1.6
@@ -170,13 +170,6 @@
const int custom_socket_option_level = 0xA5100000;
const int enable_connection_aborted_option = 1;
-#if defined(_WIN64)
-inline std::size_t hash_value(SOCKET s)
-{
- return static_cast<std::size_t>(s);
-}
-#endif // defined(_WIN64)
-
} // namespace detail
} // namespace asio
} // namespace boost
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
