[Boost-commit] svn:boost r58141 - in sandbox/itl/boost: itl validate/driver

Subject: [Boost-commit] svn:boost r58141 - in sandbox/itl/boost: itl validate/driver
From: afojgo_at_[hidden]
Date: 2009-12-04 10:48:38

Author: jofaber
Date: 2009-12-04 10:48:37 EST (Fri, 04 Dec 2009)
New Revision: 58141
URL: http://svn.boost.org/trac/boost/changeset/58141

Log:
Silencing warnings.
Text files modified: 
   sandbox/itl/boost/itl/interval.hpp                       |     4 ++--                                    
   sandbox/itl/boost/itl/interval_base_set.hpp              |     2 +-                                      
   sandbox/itl/boost/itl/ptime.hpp                          |     1 +                                       
   sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp |     3 +--                                     
   4 files changed, 5 insertions(+), 5 deletions(-)

Modified: sandbox/itl/boost/itl/interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval.hpp	(original)
+++ sandbox/itl/boost/itl/interval.hpp	2009-12-04 10:48:37 EST (Fri, 04 Dec 2009)
@@ -509,13 +509,13 @@
         cardinality(const IntervalT& x) 
     { 
         return x.empty()? itl::neutron<typename IntervalT::size_type>::value() 
-                        : static_cast<typename IntervalT::size_type>(succ(x.last()-x.first()));
+                        : static_cast<typename IntervalT::size_type>(succ(x.last() - x.first()));
     }
 
     static typename IntervalT::difference_type length(const IntervalT& x) 
     {
         return x.empty() ? itl::neutron<typename IntervalT::difference_type>::value() 
-                         : succ(x.last() - x.first()); 
+                         : static_cast<typename IntervalT::difference_type>(succ(x.last() - x.first())); 
     }
 
     static bool unaligned_lwb_equal(const IntervalT& x1, const IntervalT& x2)

Modified: sandbox/itl/boost/itl/interval_base_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_base_set.hpp	(original)
+++ sandbox/itl/boost/itl/interval_base_set.hpp	2009-12-04 10:48:37 EST (Fri, 04 Dec 2009)
@@ -465,7 +465,7 @@
     static bool key_less(LeftIterT lhs_, RightIterT rhs_) 
     { return key_compare()(*lhs_, *rhs_); }
 
-    static value_type make_domain_element(const domain_type& dom_val, const codomain_type& codom_val)
+    static value_type make_domain_element(const domain_type& dom_val, const codomain_type&)
     { return value_type(interval_type(dom_val)); }
 
 protected:

Modified: sandbox/itl/boost/itl/ptime.hpp
==============================================================================
--- sandbox/itl/boost/itl/ptime.hpp	(original)
+++ sandbox/itl/boost/itl/ptime.hpp	2009-12-04 10:48:37 EST (Fri, 04 Dec 2009)
@@ -24,6 +24,7 @@
 #pragma warning(push)
 #pragma warning(disable:4100) // boost/date_time/time.hpp(80) : warning C4100: 'as_offset' : unreferenced formal parameter
 #pragma warning(disable:4244) // 'argument' : conversion from 'int' to 'unsigned short', possible loss of data
+#pragma warning(disable:4702) // boost\lexical_cast.hpp(1159) : warning C4702: unreachable code
 #endif                        
 #include <boost/date_time/posix_time/posix_time.hpp>
 #ifdef BOOST_MSVC

Modified: sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp	(original)
+++ sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp	2009-12-04 10:48:37 EST (Fri, 04 Dec 2009)
@@ -92,7 +92,7 @@
     {
         int rootChoice         = _rootChoice.some();
         int domainChoice       = _domainChoice.some();
-        int codomainChoice     = _codomainChoice.some();
+        //int codomainChoice     = _codomainChoice.some();
         int neutronizerChoice  = _neutronizerChoice.some();
 
         switch(rootChoice)
@@ -131,7 +131,6 @@
         default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
         } //switch(rootChoice)
 
-        return NULL; //just to please the compiler ;)
     }
 
 };