[osmium-tool] 66/97: Move namespace alias into smaller scope.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Tue Jul 21 20:15:35 UTC 2015


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 7ab2dc641f7034d4eb1adf52d1d3d81e699bbe9b
Author: Jochen Topf <jochen at topf.org>
Date:   Thu Jan 29 16:23:10 2015 +0100

    Move namespace alias into smaller scope.
---
 src/command_apply_changes.cpp | 2 +-
 src/command_cat.cpp           | 2 +-
 src/command_fileinfo.cpp      | 2 +-
 src/command_merge_changes.cpp | 2 +-
 src/command_time_filter.cpp   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp
index 3cf5c7b..bea4710 100644
--- a/src/command_apply_changes.cpp
+++ b/src/command_apply_changes.cpp
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <boost/function_output_iterator.hpp>
 #include <boost/program_options.hpp>
-namespace po = boost::program_options;
 
 #include <osmium/io/any_input.hpp>
 #include <osmium/io/any_output.hpp>
@@ -33,6 +32,7 @@ namespace po = boost::program_options;
 #include "command_apply_changes.hpp"
 
 bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) {
+    namespace po = boost::program_options;
     po::variables_map vm;
     try {
         po::options_description cmdline("Allowed options");
diff --git a/src/command_cat.cpp b/src/command_cat.cpp
index 87394fb..6b44cb7 100644
--- a/src/command_cat.cpp
+++ b/src/command_cat.cpp
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <iterator>
 
 #include <boost/program_options.hpp>
-namespace po = boost::program_options;
 
 #include <osmium/io/any_input.hpp>
 #include <osmium/io/any_output.hpp>
@@ -32,6 +31,7 @@ namespace po = boost::program_options;
 #include "command_cat.hpp"
 
 bool CommandCat::setup(const std::vector<std::string>& arguments) {
+    namespace po = boost::program_options;
     po::variables_map vm;
     try {
         po::options_description cmdline("Allowed options");
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 17a41a1..d8f6e85 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #include <boost/program_options.hpp>
-namespace po = boost::program_options;
 
 #include <osmium/io/any_input.hpp>
 #include <osmium/handler.hpp>
@@ -46,6 +45,7 @@ namespace po = boost::program_options;
 #endif
 
 bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
+    namespace po = boost::program_options;
     po::variables_map vm;
     try {
         po::options_description cmdline("Allowed options");
diff --git a/src/command_merge_changes.cpp b/src/command_merge_changes.cpp
index f5c87ca..5e83696 100644
--- a/src/command_merge_changes.cpp
+++ b/src/command_merge_changes.cpp
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <iostream>
 
 #include <boost/program_options.hpp>
-namespace po = boost::program_options;
 
 #include <osmium/io/any_input.hpp>
 #include <osmium/io/any_output.hpp>
@@ -34,6 +33,7 @@ namespace po = boost::program_options;
 #include "command_merge_changes.hpp"
 
 bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) {
+    namespace po = boost::program_options;
     po::variables_map vm;
     try {
         po::options_description cmdline("Allowed options");
diff --git a/src/command_time_filter.cpp b/src/command_time_filter.cpp
index 79183fc..5e5bff7 100644
--- a/src/command_time_filter.cpp
+++ b/src/command_time_filter.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/program_options.hpp>
-namespace po = boost::program_options;
 
 #include <osmium/io/any_input.hpp>
 #include <osmium/io/any_output.hpp>
@@ -32,6 +31,7 @@ namespace po = boost::program_options;
 #include "command_time_filter.hpp"
 
 bool CommandTimeFilter::setup(const std::vector<std::string>& arguments) {
+    namespace po = boost::program_options;
     po::variables_map vm;
     try {
         po::options_description cmdline("Allowed options");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git



More information about the Pkg-grass-devel mailing list