[yoda-svn] r442 - in trunk: include/YODA tests

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Wed May  2 11:24:19 2012
New Revision: 442

Log:
Tests compile again. Some fail.

Modified:
   trunk/include/YODA/Weights.h
   trunk/tests/Makefile.am
   trunk/tests/TestWeights.cc

Modified: trunk/include/YODA/Weights.h
==============================================================================
--- trunk/include/YODA/Weights.h	Wed May  2 11:17:40 2012	(r441)
+++ trunk/include/YODA/Weights.h	Wed May  2 11:24:19 2012	(r442)
@@ -231,7 +231,7 @@
     /// Initialise an empty list of weights keys to match those of another Weights object
     void _initToMatch(const Weights& other) {
       if (keys().empty()) {
-        raise LogicError("Weights::_initToMatch shouldn't ever be called if there are already defined weights keys");
+        throw LogicError("Weights::_initToMatch shouldn't ever be called if there are already defined weights keys");
       }
       for (size_t i = 0; i < other.size(); ++i) {
         _values[other.keys()[i]] = 0;

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	Wed May  2 11:17:40 2012	(r441)
+++ trunk/tests/Makefile.am	Wed May  2 11:24:19 2012	(r442)
@@ -20,7 +20,6 @@
   testscatter3Dcreate\
   testscatter3Dmodify
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_LDFLAGS = -L$(top_builddir)/src -lYODA
 
 testweights_SOURCES = TestWeights.cc

Modified: trunk/tests/TestWeights.cc
==============================================================================
--- trunk/tests/TestWeights.cc	Wed May  2 11:17:40 2012	(r441)
+++ trunk/tests/TestWeights.cc	Wed May  2 11:24:19 2012	(r442)
@@ -43,5 +43,5 @@
   foo(5);
   foo(Weights(6));
 
-  return EXIT_SUCCESS;
+  return 0;
 }