From 2f6fcc01e35dd60ab900924ed7b043f3ccf873d2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 20 Dec 2015 05:10:19 +0200
Subject: Fix Clang errors

---
 brep/module.cxx    | 12 ++++++------
 loader/loader.cxx  |  8 ++++++--
 web/apache/service |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/brep/module.cxx b/brep/module.cxx
index 9e7eda3..283731e 100644
--- a/brep/module.cxx
+++ b/brep/module.cxx
@@ -26,8 +26,6 @@ using namespace placeholders; // For std::bind's _1, etc.
 
 namespace brep
 {
-  using namespace cli;
-
   // module
   //
   bool module::
@@ -148,6 +146,8 @@ namespace brep
   name_values module::
   expand_options (const name_values& v)
   {
+    using namespace cli;
+
     vector<const char*> argv;
     for (const auto& nv: v)
     {
@@ -209,7 +209,7 @@ namespace brep
       static option_descriptions od (convert (options::module::description ()));
       name_values mo (filter (opts, od));
       name_value_scanner s (mo);
-      options::module o (s, unknown_mode::fail, unknown_mode::fail);
+      options::module o (s, cli::unknown_mode::fail, cli::unknown_mode::fail);
 
       verb_ = o.verbosity ();
       loaded_ = true;
@@ -359,7 +359,7 @@ namespace brep
     if (i_ != name_values_.end ())
       return name_ ? i_->name.c_str () : i_->value->c_str ();
     else
-      throw eos_reached ();
+      throw cli::eos_reached ();
   }
 
   const char* module::name_value_scanner::
@@ -372,7 +372,7 @@ namespace brep
       return r;
     }
     else
-      throw eos_reached ();
+      throw cli::eos_reached ();
   }
 
   void module::name_value_scanner::
@@ -394,6 +394,6 @@ namespace brep
       }
     }
     else
-      throw eos_reached ();
+      throw cli::eos_reached ();
   }
 }
diff --git a/loader/loader.cxx b/loader/loader.cxx
index 343c810..68f145b 100644
--- a/loader/loader.cxx
+++ b/loader/loader.cxx
@@ -94,8 +94,12 @@ load_repositories (path p)
 
       // Skip until first non-space (true) or space (false).
       //
-      auto skip ([&i, &e](bool s = true) -> decltype (i) {
-          for (; i != e && space (*i) == s; ++i); return i;});
+      auto skip = [&i, &e](bool s = true) -> decltype (i)
+      {
+        for (; i != e && space (*i) == s; ++i)
+          ;
+        return i;
+      };
 
       skip (); // Skip leading spaces.
 
diff --git a/web/apache/service b/web/apache/service
index 7eef81a..32ca98d 100644
--- a/web/apache/service
+++ b/web/apache/service
@@ -108,7 +108,7 @@ namespace web
 
         request req (r);
         log l (r->server);
-        return srv->handle<M> (req, l);
+        return srv->template handle<M> (req, l);
       }
 
     private:
-- 
cgit v1.1