Rename schema names OPTIONAL and INDEX to IS_OPTIONAL and IS_INDEX to avoid name clashes in Windows header files; fixes QPID-1408

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@708704 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 4 deletions

diff --git a/qpid/cpp/managementgen/qmf/schema.py b/qpid/cpp/managementgen/qmf/schema.py
index 031721f47f..692a474992 100755
--- a/qpid/cpp/managementgen/qmf/schema.py
+++ b/qpid/cpp/managementgen/qmf/schema.py
@@ -367,8 +367,8 @@ class SchemaProperty:
     stream.write ("    ft.setString (NAME, \"" + self.name + "\");\n")
     stream.write ("    ft.setInt    (TYPE, TYPE_" + self.type.type.base +");\n")
     stream.write ("    ft.setInt    (ACCESS, ACCESS_" + self.access + ");\n")
-    stream.write ("    ft.setInt    (INDEX, " + str (self.isIndex) + ");\n")
-    stream.write ("    ft.setInt    (OPTIONAL, " + str (self.isOptional) + ");\n")
+    stream.write ("    ft.setInt    (IS_INDEX, " + str (self.isIndex) + ");\n")
+    stream.write ("    ft.setInt    (IS_OPTIONAL, " + str (self.isOptional) + ");\n")
     if self.unit != None:
       stream.write ("    ft.setString (UNIT,   \"" + self.unit   + "\");\n")
     if self.min != None:
diff --git a/qpid/cpp/managementgen/qmf/templates/Class.cpp b/qpid/cpp/managementgen/qmf/templates/Class.cpp
index 0a69939821..247e1090ff 100644
--- a/qpid/cpp/managementgen/qmf/templates/Class.cpp
+++ b/qpid/cpp/managementgen/qmf/templates/Class.cpp
@@ -72,8 +72,8 @@ namespace {
     const string NAME("name");
     const string TYPE("type");
     const string ACCESS("access");
-    const string INDEX("index");
-    const string OPTIONAL("optional");
+    const string IS_INDEX("index");
+    const string IS_OPTIONAL("optional");
     const string UNIT("unit");
     const string MIN("min");
     const string MAX("max");