[Rivet-svn] r4111 - in branches/2012-06-aidarivet: include/LWH src/Tools

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Fri Jan 25 18:56:20 2013
New Revision: 4111

Log:
Two GENSER patches, thanks to Anton Karneyeu.

Modified:
   branches/2012-06-aidarivet/include/LWH/Axis.h
   branches/2012-06-aidarivet/src/Tools/Makefile.am

Modified: branches/2012-06-aidarivet/include/LWH/Axis.h
==============================================================================
--- branches/2012-06-aidarivet/include/LWH/Axis.h	Fri Jan 25 18:55:35 2013	(r4110)
+++ branches/2012-06-aidarivet/include/LWH/Axis.h	Fri Jan 25 18:56:20 2013	(r4111)
@@ -115,7 +115,7 @@
    *
    */
   int coordToIndex(double coord) const {
-    assert( ! isnan(coord) );
+    assert( ! std::isnan(coord) );
     if ( coord >= upper ) return OVERFLOW_BIN;
     else if ( coord < lower ) return UNDERFLOW_BIN;
     else return int((coord - lower)/binWidth(0));

Modified: branches/2012-06-aidarivet/src/Tools/Makefile.am
==============================================================================
--- branches/2012-06-aidarivet/src/Tools/Makefile.am	Fri Jan 25 18:55:35 2013	(r4110)
+++ branches/2012-06-aidarivet/src/Tools/Makefile.am	Fri Jan 25 18:56:20 2013	(r4111)
@@ -14,7 +14,6 @@
   TinyXML/tinyxml.cpp \
   TinyXML/tinyxmlerror.cpp \
   TinyXML/tinyxmlparser.cpp \
-  BinnedHistogram.cc \
   mt2_bisect.cc \
   RivetMT2.cc \
   BinnedHistogram.cc