Merge pull request #791 from lygstate/cpp-literal-imporve

Cpp literal improve.

Author: tmontgomery

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -2407,24 +2407,41 @@ private CharSequence generateLiteral(final PrimitiveType type, final String valu
                 break;
 
             case UINT32:
+            {
+                final long intValue = Long.parseLong(value);
+                literal = "UINT32_C(0x" + Integer.toHexString((int)intValue) + ")";
+                break;
+            }
             case INT32:
-                literal = value;
+                final long intValue = Long.parseLong(value);
+                if (intValue == Integer.MIN_VALUE)
+                {
+                    literal = "INT32_MIN";
+                }
+                else
+                {
+                    literal = "INT32_C(" + Long.toString(intValue) + ")";
+                }
                 break;
 
             case FLOAT:
                 literal = value.endsWith("NaN") ? "SBE_FLOAT_NAN" : value + "f";
                 break;
 
             case INT64:
-                literal = value + "L";
-                if (value.equals("-9223372036854775808"))
+                final long longValue = Long.parseLong(value);
+                if (longValue == Long.MIN_VALUE)
                 {
                     literal = "INT64_MIN";
                 }
+                else
+                {
+                    literal = "INT64_C(" + String.valueOf(longValue) + ")";
+                }
                 break;
 
             case UINT64:
-                literal = "0x" + Long.toHexString(Long.parseLong(value)) + "L";
+                literal = "UINT64_C(0x" + Long.toHexString(Long.parseLong(value)) + ")";
                 break;
 
             case DOUBLE: