From dca38b27afc25d329fd7a7241095b40e2a1ecae2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 27 Jul 2019 11:38:53 +0200
Subject: Add support for option merging (--generate-merge)

---
 cli/inline.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cli/inline.cxx')

diff --git a/cli/inline.cxx b/cli/inline.cxx
index 9dc5440..4bc0182 100644
--- a/cli/inline.cxx
+++ b/cli/inline.cxx
@@ -26,7 +26,7 @@ namespace
          << "return this->" << emember (o) << ";"
          << "}";
 
-      if (modifier)
+      if (gen_modifier)
       {
         os << inl << type << "& " << scope << "::" << endl
            << name << " ()"
@@ -41,7 +41,7 @@ namespace
            << "}";
       }
 
-      if (specifier && type != "bool")
+      if (gen_specifier && type != "bool")
       {
         string spec (especifier (o));
 
@@ -51,7 +51,7 @@ namespace
            << "return this->" << especifier_member (o) << ";"
            << "}";
 
-        if (modifier)
+        if (gen_modifier)
           os << inl << "void " << scope << "::" << endl
              << spec << "(bool x)"
              << "{"
-- 
cgit v1.1