diff options
| author | Orion Hodson <oth@google.com> | 2021-03-08 09:52:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-08 09:52:16 +0000 |
| commit | 86d0caa848329e0467a31168cdd379c41b141297 (patch) | |
| tree | 082af47e99da7b4d375a98151fb699b4908eb631 | |
| parent | 2b3040434ef85b51f87c546ca3193dc0f2581981 (diff) | |
| parent | fe3b6e5ca6d4b79950992046a7d55011cca9f459 (diff) | |
| download | xsdc-86d0caa848329e0467a31168cdd379c41b141297.tar.gz | |
xsdc: emit explicit single argument constructor decls am: dc83ae3433 am: fe3b6e5ca6
Original change: https://android-review.googlesource.com/c/platform/system/tools/xsdc/+/1622420
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9dd5d1ebe28dadbb3799378ad7cc26dad6be97b1
| -rw-r--r-- | src/com/android/xsdc/cpp/CppCodeGenerator.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/xsdc/cpp/CppCodeGenerator.java b/src/com/android/xsdc/cpp/CppCodeGenerator.java index 561d3f5..432d510 100644 --- a/src/com/android/xsdc/cpp/CppCodeGenerator.java +++ b/src/com/android/xsdc/cpp/CppCodeGenerator.java @@ -734,7 +734,14 @@ public class CppCodeGenerator { if (constructorArgsString.length() > 0) { constructorArgsString = constructorArgsString.substring(2); } - parserHeaderFile.printf("%s(%s);\n", name, constructorArgsString); + + boolean useExplicit = + !(constructorArgsString.isEmpty() || constructorArgsString.contains(",")); + if (useExplicit) { + parserHeaderFile.printf("explicit %s(%s);\n", name, constructorArgsString); + } else { + parserHeaderFile.printf("%s(%s);\n", name, constructorArgsString); + } parserCppFile.printf("\n%s::%s(%s) : ", fullName, name, constructorArgsString); String parentArgsString = parentArgs.toString(); |