From ca4c01c87aedc82366ff0d253f5f8eb8d9d00954 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 28 Oct 2009 14:29:45 +0200
Subject: Use assignment initialization for fundamental types

---
 cli/runtime-source.cxx | 6 +++---
 cli/source.cxx         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cli')

diff --git a/cli/runtime-source.cxx b/cli/runtime-source.cxx
index 1be8f13..9f96416 100644
--- a/cli/runtime-source.cxx
+++ b/cli/runtime-source.cxx
@@ -160,7 +160,7 @@ generate_runtime_source (context& ctx)
      << "parse (std::vector<X>& v, char** argv, int n)"
      << "{"
      << "X x;"
-     << "int i (parser<X>::parse (x, argv, n));"
+     << "int i = parser<X>::parse (x, argv, n);"
      << "v.push_back (x);"
      << "return i;"
      << "}"
@@ -175,7 +175,7 @@ generate_runtime_source (context& ctx)
      << "parse (std::set<X>& s, char** argv, int n)"
      << "{"
      << "X x;"
-     << "int i (parser<X>::parse (x, argv, n));"
+     << "int i = parser<X>::parse (x, argv, n);"
      << "s.insert (x);"
      << "return i;"
      << "}"
@@ -192,7 +192,7 @@ generate_runtime_source (context& ctx)
      << "if (n > 1)"
      << "{"
      << "std::string s (argv[1]);"
-     << "std::string::size_type p (s.find ('='));"
+     << "std::string::size_type p = s.find ('=');"
      << endl
      << "if (p == std::string::npos)"
      << "{"
diff --git a/cli/source.cxx b/cli/source.cxx
index 991968c..7a23c30 100644
--- a/cli/source.cxx
+++ b/cli/source.cxx
@@ -77,8 +77,8 @@ namespace
       for (names::name_iterator i (n.name_begin ()); i != n.name_end (); ++i)
       {
         os << "_cli_" << scope << "_map_[\"" << *i << "\"] = " << endl
-           << "&::cli::thunk<" << scope << ", " << type << ", " <<
-          "&" << scope << "::" << member << ">;";
+           << "&::cli::thunk< " << scope << ", " << type << ", " <<
+          "&" << scope << "::" << member << " >;";
       }
     }
   };
@@ -205,12 +205,12 @@ namespace
          << "{";
 
       if (sep)
-        os << "bool opt (true);" // Still recognizing options.
+        os << "bool opt = true;" // Still recognizing options.
            << endl;
 
       os << "for (; start < argc;)"
          << "{"
-         << "const char* s (argv[start]);";
+         << "const char* s = argv[start];";
 
       if (sep)
         os << endl
-- 
cgit v1.1