[osmium-tool] 42/44: Workaround for Windows build failure.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.1.0
in repository osmium-tool.

commit 01d722ebe6cc48735f42cd028f6f08240c89b4be
Author: Jochen Topf <jochen at topf.org>
Date:   Sat Jul 4 08:31:18 2015 +0200

    Workaround for Windows build failure.
    
    error C2797: ist initialization inside member initializer list or non-static
    data member initializer is not implemented
---
 src/osmc.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/osmc.hpp b/src/osmc.hpp
index 33636d2..a6eeff4 100644
--- a/src/osmc.hpp
+++ b/src/osmc.hpp
@@ -197,7 +197,7 @@ class with_osm_output {
 
 protected:
 
-    std::string m_generator { "osmium/" OSMIUM_VERSION };
+    std::string m_generator;
     std::vector<std::string> m_output_headers;
     std::string m_output_filename = "-"; // default: stdout
     std::string m_output_format;
@@ -206,6 +206,10 @@ protected:
 
 public:
 
+    with_osm_output() :
+        m_generator("osmium/" OSMIUM_VERSION) {
+    }
+
     void setup_output_file(const po::variables_map& vm) {
         if (vm.count("generator")) {
             m_generator = vm["generator"].as<std::string>();

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