* src/task/boolean_task.hh (task::BooleanTask::flag_) * src/task/int_task.hh (task::IntTask::var_): Here. Reported by Theophile Ranquet theophile.ranquet@epita.fr. --- ChangeLog | 9 +++++++++ src/task/boolean_task.hh | 6 +++--- src/task/int_task.hh | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 305b7a8..80e75ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-05-22 Roland Levillain roland@lrde.epita.fr + + Get rid of mutable references, rejected by g++ since version 4.6. + + * src/task/boolean_task.hh (task::BooleanTask::flag_) + * src/task/int_task.hh (task::IntTask::var_): + Here. + Reported by Theophile Ranquet theophile.ranquet@epita.fr. + 2012-03-19 Roland Levillain roland@lrde.epita.fr
Update the address of the FSF in the text of the GNU FDL. diff --git a/src/task/boolean_task.hh b/src/task/boolean_task.hh index b86d0db..1afcfe8 100644 --- a/src/task/boolean_task.hh +++ b/src/task/boolean_task.hh @@ -1,7 +1,7 @@ // // This file is part of Nolimips, a MIPS simulator with unlimited registers -// Copyright (C) 2004, 2006 Akim Demaille akim@epita.fr and -// Benoit Perrot benoit@lrde.epita.fr +// Copyright (C) 2004, 2006, 2012 Akim Demaille akim@epita.fr and +// Benoit Perrot benoit@lrde.epita.fr // // Nolimips is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ namespace task virtual void execute() const;
private: - mutable bool &flag_; + bool &flag_; };
} // namespace task diff --git a/src/task/int_task.hh b/src/task/int_task.hh index 98e81ae..b8b6506 100644 --- a/src/task/int_task.hh +++ b/src/task/int_task.hh @@ -1,7 +1,7 @@ // // This file is part of Nolimips, a MIPS simulator with unlimited registers -// Copyright (C) 2004, 2006 Akim Demaille akim@epita.fr and -// Benoit Perrot benoit@lrde.epita.fr +// Copyright (C) 2004, 2006, 2012 Akim Demaille akim@epita.fr and +// Benoit Perrot benoit@lrde.epita.fr // // Nolimips is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ namespace task
private: mutable int value_; - mutable int &var_; + int &var_; int min_; int max_; };