ccmtools-cvs

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20060/src/ccmtools/CppGenerator

Modified Files:
      Tag: BRANCH-FHJ
	CppLocalGenerator.java 
Log Message:
Merged from 0.8.7

Index: CppLocalGenerator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppLocalGenerator.java,v
retrieving revision 1.54
retrieving revision 1.54.4.1
diff -C2 -d -r1.54 -r1.54.4.1
*** CppLocalGenerator.java	24 Jan 2007 15:37:18 -0000	1.54
--- CppLocalGenerator.java	26 Jan 2007 12:29:51 -0000	1.54.4.1
***************
*** 405,408 ****
--- 405,420 ----
          MConstantDef constant = (MConstantDef) currentNode;
          
+         if(dataType.equals("ConstantValue"))
+         {
+             MIDLType idlType = constant.getIdlType();
+             if(idlType instanceof MStringDef || idlType instanceof MWstringDef)
+             {
+                 dataValue = "\"" + constant.getConstValue().toString() + "\";";
+             }
+             else
+             {
+                 dataValue = constant.getConstValue().toString() + ";";
+             }
+         }
          return dataValue;
      }