quicktype-core 7.0.24 → 7.0.26

package/dist/language/CPlusPlus.js

@@ -1343,6 +1343,20 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitConstraintClasses();
             this.ensureBlankLine();
         }
+        this.ensureBlankLine();
+        var untypedMacroName = new String("NLOHMANN_UNTYPED_");
+        var optionalMacroName = new String("NLOHMANN_OPTIONAL_");
+        this._namespaceNames.forEach(function (value) {
+            // We can't use upper name, because namespaces are case sensitive
+            untypedMacroName += value;
+            untypedMacroName += "_";
+            optionalMacroName += value;
+            optionalMacroName += "_";
+        });
+        untypedMacroName += "HELPER";
+        untypedMacroName += "HELPER";
+        this.emitLine("#ifndef " + untypedMacroName);
+        this.emitLine("#define " + untypedMacroName);
         this.emitBlock([
             "inline json get_untyped(", this.withConst("json"), " & j, ", this.withConst("char"), " * property)"
         ], false, () => {
@@ -1357,8 +1371,12 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         ], false, () => {
             this.emitLine("return get_untyped(j, property.data());");
         });
+        this.emitLine("#endif");
         this.ensureBlankLine();
         if (this.haveUnions || this.haveOptionalProperties) {
+            this.ensureBlankLine();
+            this.emitLine("#ifndef " + optionalMacroName);
+            this.emitLine("#define " + optionalMacroName);
             this.emitLine("template <typename T>");
             this.emitBlock(["inline ", optionalType, "<T> get_optional(", this.withConst("json"), " & j, ", this.withConst("char"), " * property)"], false, () => {
                 this.emitBlock(["if (j.find(property) != j.end())"], false, () => {
@@ -1371,6 +1389,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitBlock(["inline ", optionalType, "<T> get_optional(", this.withConst("json"), " & j, std::string property)"], false, () => {
                 this.emitLine("return get_optional<T>(j, property.data());");
             });
+            this.emitLine("#endif");
             this.ensureBlankLine();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "7.0.24",
+    "version": "7.0.26",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "2dc22cb8dee03e613da69ca99ab2b4057f5bf68a"
+        "commit": "7599c476f860ff6a60dca93e3cebfeed84dbdf75"
     }
 }