aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrion Hodson <oth@google.com>2021-03-07 15:42:06 +0000
committerOrion Hodson <oth@google.com>2021-03-07 15:55:44 +0000
commitdc83ae34337eb2910f01058d945f40948bd29b09 (patch)
tree082af47e99da7b4d375a98151fb699b4908eb631
parentd69b0fc8f4ec97015c71daf4c2b95c5096306950 (diff)
downloadxsdc-dc83ae34337eb2910f01058d945f40948bd29b09.tar.gz
xsdc: emit explicit single argument constructor decls
Quietens builds warnings arising from including xsdc generated cpp headers. Bug: N/A Test: m Change-Id: I1a60d6c9560cfca47bdb6b55ecb16dad0e9e4027
-rw-r--r--src/com/android/xsdc/cpp/CppCodeGenerator.java9
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();