diff --git a/adevs-2.6-build.patch b/adevs-2.6-build.patch index b9e839f..80cba4e 100644 --- a/adevs-2.6-build.patch +++ b/adevs-2.6-build.patch @@ -11,6 +11,19 @@ index aa2f442..ed6e53e 100644 // Check for a model transition if (model->model_transition() && model->getParent() != NULL) { +diff --git a/include/adevs_time.h b/include/adevs_time.h +index 76111ac..061351b 100644 +--- a/include/adevs_time.h ++++ b/include/adevs_time.h +@@ -47,7 +47,7 @@ template struct Time + /// Value for infinity + static adevs::Time Inf() { return Time(adevs_inf(),0); } + /// Constructor. Default time is (0,0). +- Time(T t = 0, unsigned int c = 0):t(t),c(c){} ++ Time(T t = adevs_zero(), unsigned int c = 0):t(t),c(c){} + /// Copy constructor + Time(const Time& t2):t(t2.t),c(t2.c){} + /// Assignment operator diff --git a/test/alt_time_tests.cpp b/test/alt_time_tests.cpp index 2409adb..0d0e553 100644 --- a/test/alt_time_tests.cpp diff --git a/adevs.spec b/adevs.spec index 5b8a702..a8d3fbd 100644 --- a/adevs.spec +++ b/adevs.spec @@ -1,6 +1,6 @@ Name: adevs Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for constructing discrete event simulation Group: System Environment/Libraries License: LGPLv2+ @@ -97,6 +97,9 @@ rm -r ./examples/java_life %doc docs/api docs/manual examples %changelog +* Tue Jun 18 2013 Jan Kaluza - 2.3-4 +- fix building tests with the newest g++ + * Mon Jun 17 2013 Jan Kaluza - 2.6-3 - rename -docs package to -doc