[Echempp-devel] Analysis/Data/test Makefile.am, 1.9, 1.10 dataTest.cpp, 1.8, 1.9
Status: Beta
Brought to you by:
berndspeiser
|
From: Bernd S. <ber...@us...> - 2008-03-29 11:51:22
|
Update of /cvsroot/echempp/Analysis/Data/test In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8705/Analysis/Data/test Modified Files: Makefile.am dataTest.cpp Log Message: adapted to gcc 4.3.0 Index: dataTest.cpp =================================================================== RCS file: /cvsroot/echempp/Analysis/Data/test/dataTest.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dataTest.cpp 4 Dec 2005 21:42:40 -0000 1.8 --- dataTest.cpp 29 Mar 2008 11:51:09 -0000 1.9 *************** *** 94,98 **** prof.push_back(std::sin(t)); if( t < 0.4 ) t += 0.1; ! else if( t >= 0.4 & t < 0.7 ) t+=0.05; else if( t >= 0.7 ) t+=0.1; } --- 94,98 ---- prof.push_back(std::sin(t)); if( t < 0.4 ) t += 0.1; ! else if( (t >= 0.4) & (t < 0.7) ) t+=0.05; else if( t >= 0.7 ) t+=0.1; } Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Analysis/Data/test/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 16 May 2006 06:40:41 -0000 1.9 --- Makefile.am 29 Mar 2008 11:51:09 -0000 1.10 *************** *** 8,12 **** -lloki ! dataTest_CXXFLAGS = -DTIXML_USE_STL -Wall -Werror -pedantic-errors INCLUDES = -I$(top_srcdir) \ -I$(top_srcdir)/../Experiment \ --- 8,12 ---- -lloki ! dataTest_CXXFLAGS = -Wall -Werror -pedantic-errors INCLUDES = -I$(top_srcdir) \ -I$(top_srcdir)/../Experiment \ |