g++/final: don't add extra code to check for buffer overflows (-fno-stack-protector)

[senf.git] / senf / Utils / StatisticAccumulator.test.cc

diff --git a/senf/Utils/StatisticAccumulator.test.cc b/senf/Utils/StatisticAccumulator.test.cc
index 17059e8..81f38db 100644 (file)
--- a/senf/Utils/StatisticAccumulator.test.cc
+++ b/senf/Utils/StatisticAccumulator.test.cc
@@ -2,26 +2,29 @@
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-/** \file
-    \brief StatisticAccumulator non-inline template implementation  */
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Mathias Kretschmer <mtk@berlios.de>
+//   Jens Moedeker <jmo@berlios.de>
 
 // Custom includes
 
@@ -29,7 +32,7 @@
 #include "Statistics.hh"
 #include "auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
+#include <math.h>
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
@@ -37,7 +40,7 @@ SENF_AUTO_UNIT_TEST(StatisticAccumulator)
 {
     senf::Statistics s;
 
-    senf::StatisticAccumulatorInt sa;
+    senf::StatisticAccumulator<int> sa;
 
     sa.accumulate( 5);
     sa.accumulate( 3);
@@ -56,14 +59,11 @@ SENF_AUTO_UNIT_TEST(StatisticAccumulator)
 
     BOOST_CHECK_EQUAL( sa.max(), 0);
     BOOST_CHECK_EQUAL( sa.min(), 0);
-    BOOST_CHECK( (boost::math::isnan)( sa.avg()));
+//    BOOST_CHECK( (boost::math::isnan)( sa.avg()));
+    BOOST_CHECK( ::isnan( sa.avg()) != 0);
     BOOST_CHECK_EQUAL( sa.last_avg(), 5.0);
-    BOOST_CHECK( (boost::math::isnan)( sa.stddev()));
+    BOOST_CHECK( ::isnan( sa.stddev()));
     BOOST_CHECK_EQUAL( sa.count(), 0);
-
-
-
-
 }
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_