From 21fe0f4bdcea0a27fc8743ed0366f35e4e15c495 Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Tue, 23 Apr 2019 14:51:14 +0200 Subject: [PATCH] avoid cast warnings when compiling boost headers --- src/ComputingTasks.cc | 4 ++++ src/ConfigFile.cc | 6 +++++- src/DataTree.cc | 5 ++++- src/DynamicModel.hh | 3 +++ src/DynareMain.cc | 3 +++ src/DynareMain2.cc | 5 ++++- src/MinimumFeedbackSet.hh | 6 +++++- src/ModFile.cc | 3 +++ src/ModelTree.cc | 3 +++ src/ModelTree.hh | 3 +++ src/Statement.cc | 3 +++ src/StaticModel.hh | 5 ++++- src/SymbolTable.cc | 3 +++ 13 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/ComputingTasks.cc b/src/ComputingTasks.cc index a3f2a926..814eec45 100644 --- a/src/ComputingTasks.cc +++ b/src/ComputingTasks.cc @@ -26,9 +26,13 @@ using namespace std; #include "ComputingTasks.hh" #include "Statement.hh" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/split.hpp> #include <boost/tokenizer.hpp> +#pragma GCC diagnostic pop + #include <utility> SteadyStatement::SteadyStatement(OptionsList options_list_arg) : diff --git a/src/ConfigFile.cc b/src/ConfigFile.cc index 4a166fdc..b9fc93a4 100644 --- a/src/ConfigFile.cc +++ b/src/ConfigFile.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2010-2017 Dynare Team + * Copyright © 2010-2019 Dynare Team * * This file is part of Dynare. * @@ -23,9 +23,13 @@ #include <vector> #include "ConfigFile.hh" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/split.hpp> #include <boost/tokenizer.hpp> +#pragma GCC diagnostic pop using namespace std; diff --git a/src/DataTree.cc b/src/DataTree.cc index e03db0c7..5f7f837a 100644 --- a/src/DataTree.cc +++ b/src/DataTree.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2003-2018 Dynare Team + * Copyright © 2003-2019 Dynare Team * * This file is part of Dynare. * @@ -22,7 +22,10 @@ #include <iostream> #include <regex> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> +#pragma GCC diagnostic pop #include "DataTree.hh" diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh index fb68206c..83e34e62 100644 --- a/src/DynamicModel.hh +++ b/src/DynamicModel.hh @@ -24,8 +24,11 @@ using namespace std; #include <fstream> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> #include <boost/crc.hpp> +#pragma GCC diagnostic pop #include "StaticModel.hh" diff --git a/src/DynareMain.cc b/src/DynareMain.cc index 53200f20..a57fa607 100644 --- a/src/DynareMain.cc +++ b/src/DynareMain.cc @@ -32,7 +32,10 @@ #include <unistd.h> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> +#pragma GCC diagnostic pop #include "ParsingDriver.hh" #include "ExtendedPreprocessorTypes.hh" diff --git a/src/DynareMain2.cc b/src/DynareMain2.cc index a4ea29f2..1c0819e4 100644 --- a/src/DynareMain2.cc +++ b/src/DynareMain2.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2008-2017 Dynare Team + * Copyright © 2008-2019 Dynare Team * * This file is part of Dynare. * @@ -19,7 +19,10 @@ #include <iostream> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> +#pragma GCC diagnostic pop #include "ParsingDriver.hh" #include "ModFile.hh" diff --git a/src/MinimumFeedbackSet.hh b/src/MinimumFeedbackSet.hh index 3c4a0022..069a8924 100644 --- a/src/MinimumFeedbackSet.hh +++ b/src/MinimumFeedbackSet.hh @@ -1,5 +1,5 @@ /* - * Copyright © 2009-2010 Dynare Team + * Copyright © 2009-2019 Dynare Team * * This file is part of Dynare. * @@ -22,7 +22,11 @@ #include <map> #include <vector> + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/graph/adjacency_list.hpp> +#pragma GCC diagnostic pop using namespace std; diff --git a/src/ModFile.cc b/src/ModFile.cc index d3d26f42..b4f85ea0 100644 --- a/src/ModFile.cc +++ b/src/ModFile.cc @@ -23,7 +23,10 @@ #include <typeinfo> #include <cassert> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> +#pragma GCC diagnostic pop #include "ModFile.hh" #include "ConfigFile.hh" diff --git a/src/ModelTree.cc b/src/ModelTree.cc index 46031571..4fc731a9 100644 --- a/src/ModelTree.cc +++ b/src/ModelTree.cc @@ -25,10 +25,13 @@ #include "ModelTree.hh" #include "MinimumFeedbackSet.hh" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/graph/adjacency_list.hpp> #include <boost/graph/max_cardinality_matching.hpp> #include <boost/graph/strong_components.hpp> #include <boost/graph/topological_sort.hpp> +#pragma GCC diagnostic pop using namespace MFS; diff --git a/src/ModelTree.hh b/src/ModelTree.hh index 3a6f9a5c..ae9aa026 100644 --- a/src/ModelTree.hh +++ b/src/ModelTree.hh @@ -29,7 +29,10 @@ using namespace std; #include <ostream> #include <array> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> +#pragma GCC diagnostic pop #include "DataTree.hh" #include "ExtendedPreprocessorTypes.hh" diff --git a/src/Statement.cc b/src/Statement.cc index dec1082b..13e492bb 100644 --- a/src/Statement.cc +++ b/src/Statement.cc @@ -18,7 +18,10 @@ */ #include "Statement.hh" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/xpressive/xpressive.hpp> +#pragma GCC diagnostic pop #include <utility> void diff --git a/src/StaticModel.hh b/src/StaticModel.hh index ed7b9256..05d66eb4 100644 --- a/src/StaticModel.hh +++ b/src/StaticModel.hh @@ -1,5 +1,5 @@ /* - * Copyright © 2003-2018 Dynare Team + * Copyright © 2003-2019 Dynare Team * * This file is part of Dynare. * @@ -24,7 +24,10 @@ using namespace std; #include <fstream> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/filesystem.hpp> +#pragma GCC diagnostic pop #include "ModelTree.hh" diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc index f7c94502..18aad1c1 100644 --- a/src/SymbolTable.cc +++ b/src/SymbolTable.cc @@ -21,7 +21,10 @@ #include <sstream> #include <iostream> #include <cassert> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include <boost/algorithm/string/replace.hpp> +#pragma GCC diagnostic pop #include <utility> #include "SymbolTable.hh" -- GitLab