Add support for build2 for tests and examples

4 files changed, 12 insertions, 12 deletions

diff --git a/cli/context.cxx b/cli/context.cxx
index 7cec6e3..1c70cc7 100644
--- a/cli/context.cxx
+++ b/cli/context.cxx
@@ -404,8 +404,8 @@ format_line (output_type ot, string& r, const char* s, size_t n)
   vector<block> blocks;
 
   string link_target;
-  string link_section; // If not empty, man section; target is man name.
-  bool link_empty;     // Link has no text.
+  string link_section;     // If not empty, man section; target is man name.
+  bool link_empty (false); // Link has no text.
 
   bool escape (false);
   for (size_t i (0); i < n; ++i)
@@ -1186,7 +1186,7 @@ format (semantics::scope& scope, string const& s, bool para)
   // Number of li in ol. Since we don't support nested lists, we don't
   // need to push it into the stack.
   //
-  size_t ol_count;
+  size_t ol_count (0);
 
   // Mapping of \h to HTML tag. By default it is <h1> until we encounter
   // \h0 or \h1 at which point we change it to <h2>.
@@ -1283,7 +1283,7 @@ format (semantics::scope& scope, string const& s, bool para)
 
     // First determine what kind of paragraph block this is.
     //
-    block::kind_type k;
+    block::kind_type k (block::h);
     string id;
     string header;
     string trailer;
diff --git a/cli/header.cxx b/cli/header.cxx
index 41bdab5..41ff3c5 100644
--- a/cli/header.cxx
+++ b/cli/header.cxx
@@ -272,11 +272,11 @@ namespace
 
   //
   //
-  struct includes: traversal::cxx_includes,
-                   traversal::cli_includes,
-                   context
+  struct includes_: traversal::cxx_includes,
+                    traversal::cli_includes,
+                    context
   {
-    includes (context& c) : context (c) {}
+    includes_ (context& c) : context (c) {}
 
     virtual void
     traverse (semantics::cxx_includes& i)
@@ -318,7 +318,7 @@ generate_header (context& ctx)
   ostream& os (ctx.os);
 
   traversal::cli_unit unit;
-  includes includes (ctx);
+  includes_ includes (ctx);
   traversal::names unit_names;
   namespace_ ns (ctx);
   class_ cl (ctx);
diff --git a/cli/parser.cxx b/cli/parser.cxx
index d8c11c5..cdc421b 100644
--- a/cli/parser.cxx
+++ b/cli/parser.cxx
@@ -1155,7 +1155,7 @@ doc_string (const char* l, size_t n)
     size_t b (0), e, p;
 
     bool pre (false);
-    size_t m; // Number of leading spaces to remove in pre.
+    size_t m (0); // Number of leading spaces to remove in pre.
 
     while (more)
     {
diff --git a/cli/txt.cxx b/cli/txt.cxx
index 9fbfb27..cff6dc1 100644
--- a/cli/txt.cxx
+++ b/cli/txt.cxx
@@ -171,7 +171,7 @@ namespace
 
   struct option: traversal::option, context
   {
-    option (context& c, class_doc_type cd) : context (c), cd_ (cd) {}
+    option (context& c, class_doc_type) : context (c)/*, cd_ (cd)*/ {}
 
     virtual void
     traverse (type& o)
@@ -187,7 +187,7 @@ namespace
     }
 
   private:
-    class_doc_type cd_;
+    // class_doc_type cd_;
   };
 
   //