This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to tag v1.0.0 in repository osmium-tool.
commit a5deede04864c151263f4794b8119cad277b9ae9 Author: Jochen Topf <joc...@topf.org> Date: Wed Jun 18 11:23:16 2014 +0200 Use new overwrite flag in libosmium. --- src/command_apply_changes.cpp | 4 ++-- src/command_apply_changes.hpp | 5 +++-- src/command_cat.cpp | 2 +- src/command_cat.hpp | 3 ++- src/command_merge_changes.cpp | 4 ++-- src/command_merge_changes.hpp | 5 +++-- src/command_time_filter.cpp | 4 ++-- src/command_time_filter.hpp | 5 +++-- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp index 68e9275..82328d6 100644 --- a/src/command_apply_changes.cpp +++ b/src/command_apply_changes.cpp @@ -3,7 +3,7 @@ Osmium -- OpenStreetMap data manipulation command line tool http://osmcode.org/osmium -Copyright (C) 2013 Jochen Topf <joc...@topf.org> +Copyright (C) 2013, 2014 Jochen Topf <joc...@topf.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -83,7 +83,7 @@ bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) { } if (vm.count("overwrite")) { - m_output_overwrite = true; + m_output_overwrite = osmium::io::overwrite::allow; } if (vm.count("simplify")) { diff --git a/src/command_apply_changes.hpp b/src/command_apply_changes.hpp index 982b6a4..f13c25f 100644 --- a/src/command_apply_changes.hpp +++ b/src/command_apply_changes.hpp @@ -6,7 +6,7 @@ Osmium -- OpenStreetMap data manipulation command line tool http://osmcode.org/osmium -Copyright (C) 2013 Jochen Topf <joc...@topf.org> +Copyright (C) 2013, 2014 Jochen Topf <joc...@topf.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <vector> #include <osmium/io/file.hpp> +#include <osmium/io/overwrite.hpp> #include "osmc.hpp" @@ -39,7 +40,7 @@ class CommandApplyChanges : public Command { std::string m_input_format; std::string m_output_format; - bool m_output_overwrite = false; + osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no; bool m_simplify_change = false; bool m_remove_deleted = false; diff --git a/src/command_cat.cpp b/src/command_cat.cpp index 75f623f..1206c67 100644 --- a/src/command_cat.cpp +++ b/src/command_cat.cpp @@ -90,7 +90,7 @@ bool CommandCat::setup(const std::vector<std::string>& arguments) { } if (vm.count("overwrite")) { - m_output_overwrite = true; + m_output_overwrite = osmium::io::overwrite::allow; } } catch (boost::program_options::error& e) { diff --git a/src/command_cat.hpp b/src/command_cat.hpp index 9b9004e..37da1ce 100644 --- a/src/command_cat.hpp +++ b/src/command_cat.hpp @@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <vector> #include <osmium/io/file.hpp> +#include <osmium/io/overwrite.hpp> #include "osmc.hpp" @@ -39,7 +40,7 @@ class CommandCat : public Command { std::vector<std::string> m_output_headers; osmium::io::File m_output_file; std::vector<osmium::io::File> m_input_files; - bool m_output_overwrite = false; + osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no; public: diff --git a/src/command_merge_changes.cpp b/src/command_merge_changes.cpp index ba6adc1..e9f5839 100644 --- a/src/command_merge_changes.cpp +++ b/src/command_merge_changes.cpp @@ -3,7 +3,7 @@ Osmium -- OpenStreetMap data manipulation command line tool http://osmcode.org/osmium -Copyright (C) 2013 Jochen Topf <joc...@topf.org> +Copyright (C) 2013, 2014 Jochen Topf <joc...@topf.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -77,7 +77,7 @@ bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) { } if (vm.count("overwrite")) { - m_output_overwrite = true; + m_output_overwrite = osmium::io::overwrite::allow; } if (vm.count("simplify")) { diff --git a/src/command_merge_changes.hpp b/src/command_merge_changes.hpp index 7ccb692..b86c757 100644 --- a/src/command_merge_changes.hpp +++ b/src/command_merge_changes.hpp @@ -6,7 +6,7 @@ Osmium -- OpenStreetMap data manipulation command line tool http://osmcode.org/osmium -Copyright (C) 2013 Jochen Topf <joc...@topf.org> +Copyright (C) 2013, 2014 Jochen Topf <joc...@topf.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <vector> #include <osmium/io/file.hpp> +#include <osmium/io/overwrite.hpp> #include "osmc.hpp" @@ -38,7 +39,7 @@ class CommandMergeChanges : public Command { std::string m_input_format; std::string m_output_format; - bool m_output_overwrite = false; + osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no; bool m_simplify_change = false; osmium::io::File m_output_file; diff --git a/src/command_time_filter.cpp b/src/command_time_filter.cpp index bddc3dc..3100170 100644 --- a/src/command_time_filter.cpp +++ b/src/command_time_filter.cpp @@ -3,7 +3,7 @@ Osmium -- OpenStreetMap data manipulation command line tool http://osmcode.org/osmium -Copyright (C) 2013 Jochen Topf <joc...@topf.org> +Copyright (C) 2013, 2014 Jochen Topf <joc...@topf.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -79,7 +79,7 @@ bool CommandTimeFilter::setup(const std::vector<std::string>& arguments) { } if (vm.count("overwrite")) { - m_output_overwrite = true; + m_output_overwrite = osmium::io::overwrite::allow; } if (vm.count("verbose")) { diff --git a/src/command_time_filter.hpp b/src/command_time_filter.hpp index ed0332c..b437375 100644 --- a/src/command_time_filter.hpp +++ b/src/command_time_filter.hpp @@ -6,7 +6,7 @@ Osmium -- OpenStreetMap data manipulation command line tool http://osmcode.org/osmium -Copyright (C) 2013 Jochen Topf <joc...@topf.org> +Copyright (C) 2013, 2014 Jochen Topf <joc...@topf.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <vector> #include <osmium/io/file.hpp> +#include <osmium/io/overwrite.hpp> #include <osmium/osm/timestamp.hpp> #include "osmc.hpp" @@ -39,7 +40,7 @@ class CommandTimeFilter : public Command { std::string m_input_format; std::string m_output_format; - bool m_output_overwrite = false; + osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no; osmium::io::File m_input_file; osmium::io::File m_output_file; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel