Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50673 - in trunk/boost/test/utils: . runtime runtime/cla runtime/cla/iface
From: john_at_[hidden]
Date: 2009-01-19 11:31:23


Author: johnmaddock
Date: 2009-01-19 11:31:22 EST (Mon, 19 Jan 2009)
New Revision: 50673
URL: http://svn.boost.org/trac/boost/changeset/50673

Log:
Fix msvc warnings and Intel C++ compiler error.
Text files modified:
   trunk/boost/test/utils/named_params.hpp | 2 +-
   trunk/boost/test/utils/runtime/argument.hpp | 9 +++++++++
   trunk/boost/test/utils/runtime/cla/iface/id_policy.hpp | 9 +++++++++
   trunk/boost/test/utils/runtime/cla/named_parameter.ipp | 9 +++++++++
   4 files changed, 28 insertions(+), 1 deletions(-)

Modified: trunk/boost/test/utils/named_params.hpp
==============================================================================
--- trunk/boost/test/utils/named_params.hpp (original)
+++ trunk/boost/test/utils/named_params.hpp 2009-01-19 11:31:22 EST (Mon, 19 Jan 2009)
@@ -66,7 +66,7 @@
 
 struct nil {
     template<typename T>
-#if defined(__GNUC__) || defined(__HP_aCC)
+#if defined(__GNUC__) || defined(__HP_aCC) || defined(__EDG__)
     operator T() const
 #else
     operator T const&() const

Modified: trunk/boost/test/utils/runtime/argument.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/argument.hpp (original)
+++ trunk/boost/test/utils/runtime/argument.hpp 2009-01-19 11:31:22 EST (Mon, 19 Jan 2009)
@@ -35,6 +35,11 @@
 // ************** runtime::argument ************** //
 // ************************************************************************** //
 
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable:4244)
+#endif
+
 class argument {
 public:
     // Constructor
@@ -94,6 +99,10 @@
     return static_cast<typed_argument<T>&>( arg ).p_value.value;
 }
 
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
 //____________________________________________________________________________//
 
 } // namespace BOOST_RT_PARAM_NAMESPACE

Modified: trunk/boost/test/utils/runtime/cla/iface/id_policy.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/cla/iface/id_policy.hpp (original)
+++ trunk/boost/test/utils/runtime/cla/iface/id_policy.hpp 2009-01-19 11:31:22 EST (Mon, 19 Jan 2009)
@@ -34,6 +34,11 @@
 // ************** identification_policy ************** //
 // ************************************************************************** //
 
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable:4244)
+#endif
+
 class identification_policy {
 public:
     // Public properties
@@ -55,6 +60,10 @@
     BOOST_TEST_PROTECTED_VIRTUAL ~identification_policy() {}
 };
 
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
 } // namespace cla
 
 } // namespace BOOST_RT_PARAM_NAMESPACE

Modified: trunk/boost/test/utils/runtime/cla/named_parameter.ipp
==============================================================================
--- trunk/boost/test/utils/runtime/cla/named_parameter.ipp (original)
+++ trunk/boost/test/utils/runtime/cla/named_parameter.ipp 2009-01-19 11:31:22 EST (Mon, 19 Jan 2009)
@@ -56,6 +56,11 @@
 
 //____________________________________________________________________________//
 
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable:4244)
+#endif
+
 BOOST_RT_PARAM_INLINE bool
 string_name_policy::conflict_with( identification_policy const& id ) const
 {
@@ -87,6 +92,10 @@
     return false;
 }
 
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
 //____________________________________________________________________________//
 
 BOOST_RT_PARAM_INLINE bool


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk