[Boost-commit] svn:boost r61967 - in sandbox/numeric_bindings/libs/numeric/bindings: . umfpack/test

Subject: [Boost-commit] svn:boost r61967 - in sandbox/numeric_bindings/libs/numeric/bindings: . umfpack/test
From: thomas.klimpel_at_[hidden]
Date: 2010-05-14 08:45:45

Author: klimpel
Date: 2010-05-14 08:45:45 EDT (Fri, 14 May 2010)
New Revision: 61967
URL: http://svn.boost.org/trac/boost/changeset/61967

Log:
Merge from numeric_bindings-v1
Properties modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/numeric-bindings.jam   (contents, props changed)
Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/numeric-bindings.jam |     3 +--                                     
   sandbox/numeric_bindings/libs/numeric/bindings/umfpack/test/umf4.cc |    15 ++++-----------                         
   2 files changed, 5 insertions(+), 13 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/numeric-bindings.jam
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/numeric-bindings.jam	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/numeric-bindings.jam	2010-05-14 08:45:45 EDT (Fri, 14 May 2010)
@@ -138,6 +138,5 @@
                 <include>$(UFCONFIG_INCLUDE) ;
 lib umfpack_lib : amd_lib blas_lib
                 : <name>$(UMFPACK_LIB) <search>$(UMFPACK_PATH)
-              : :  <toolset>msvc:<define>NO_NAN
-                   <include>$(UMFPACK_INCLUDE)
+              : :  <include>$(UMFPACK_INCLUDE)
                    <include>$(UFCONFIG_INCLUDE) ;

Modified: sandbox/numeric_bindings/libs/numeric/bindings/umfpack/test/umf4.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/umfpack/test/umf4.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/umfpack/test/umf4.cc	2010-05-14 08:45:45 EDT (Fri, 14 May 2010)
@@ -89,10 +89,7 @@
 #include <cstdlib>
 #include <string> 
 #include <algorithm> 
-#include <math.h>
-#ifdef __ICC
-#  include <mathimf.h> 
-#endif  
+#include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/numeric/bindings/ublas/vector.hpp>
 #include <boost/numeric/bindings/ublas/matrix_sparse.hpp>
 #include <boost/numeric/bindings/umfpack/umfpack.hpp>
@@ -104,7 +101,7 @@
 using std::string; 
 using std::ifstream;
 using std::ofstream;
-using std::exit; 
+using std::exit;
 
 namespace ublas = boost::numeric::ublas; 
 namespace umf = boost::numeric::bindings::umfpack; 
@@ -177,22 +174,18 @@
   rnorm = 0.;
   bnorm = 0.;
   for (int i = 0; i < n; i++) {
-#ifndef NO_NAN
-    if (isnan (r [i])){
+    if ((boost::math::isnan) (r [i])){
       rnorm = r [i];
       break;
     }
-#endif 
     absr = fabs (r [i]);
     rnorm = max (rnorm, absr);
   }
   for (int i = 0; i < n; i++) {
-#ifndef NO_NAN
-    if (isnan (b [i])){
+    if ((boost::math::isnan) (b [i])){
       bnorm = b [i];
       break;
     }
-#endif 
     absb = fabs (b [i]);
     bnorm = max (bnorm, absb);
   }