svn commit: r708704 - in /incubator/qpid/trunk/qpid/cpp/managementgen/qmf: schema.py templates/Class.cpp

[shuston]

Author: shuston
Date: Tue Oct 28 15:28:48 2008
New Revision: 708704

URL: http://svn.apache.org/viewvc?rev=708704&view=rev
Log:
Rename schema names OPTIONAL and INDEX to IS_OPTIONAL and IS_INDEX to avoid 
name clashes in Windows header files; fixes QPID-1408

Modified:
    incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py
    incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.cpp

Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py?rev=708704&r1=708703&r2=708704&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py Tue Oct 28 
15:28:48 2008
@@ -367,8 +367,8 @@
     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:

Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.cpp?rev=708704&r1=708703&r2=708704&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.cpp Tue Oct 
28 15:28:48 2008
@@ -72,8 +72,8 @@
     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");