Update of /cvsroot/boost/boost/boost/multi_index/detail
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16884/boost/multi_index/detail
Modified Files:
Tag: RC_1_34_0
ord_index_node.hpp
Log Message:
merged from trunk to branch
Index: ord_index_node.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/multi_index/detail/ord_index_node.hpp,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- ord_index_node.hpp 19 May 2006 06:57:13 -0000 1.5.2.2
+++ ord_index_node.hpp 23 Feb 2007 16:16:28 -0000 1.5.2.3
@@ -1,4 +1,4 @@
-/* Copyright 2003-2006 Joaquín M López Muñoz.
+/* Copyright 2003-2007 Joaquín M López Muñoz.
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
@@ -91,6 +91,17 @@
* ordered_index_node_impl by 25%.
*/
+#if defined(BOOST_MSVC)
+/* This code casts pointers to an integer type that has been computed
+ * to be large enough to hold the pointer, however the metaprogramming
+ * logic is not always spotted by the VC++ code analyser that issues a
+ * long list of warnings.
+ */
+
+#pragma warning(push)
+#pragma warning(disable:4312 4311)
+#endif
+
struct ordered_index_node_compressed_base
{
struct color_ref
@@ -169,6 +180,9 @@
ordered_index_node_impl* left_;
ordered_index_node_impl* right_;
};
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
#endif
struct ordered_index_node_impl:
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
