Modify version 2 generator

To remove build warning messages, this patch adds initial value settings.

Change-Id: I4ff319f7a86f060e77d14c517e149680c27cc5ec
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/idlc/gen/version2/cpp_generator_base.cc b/idlc/gen/version2/cpp_generator_base.cc
index 83f3135d62fd83c7284fc51ed00d70e155baf987..30d9427f4b44ba7545011a4bd87f60d614e8867b 100644 (file)
--- a/idlc/gen/version2/cpp_generator_base.cc
+++ b/idlc/gen/version2/cpp_generator_base.cc
@@ -928,10 +928,12 @@ std::string CppGeneratorBase::GenUnitMapRead(const BaseType& type) {
     code = CB_UNIT_MAP_REMOTE_EXCEPTION_READ;
   } else if (type.ToString() == "array") {
     code = ReplaceAll(CB_UNIT_MAP_ARRAY_READ)
-        .Change("<TYPE>", ConvertTypeToString(*type.GetMetaType()));
+        .Change("<TYPE>", ConvertTypeToString(*type.GetMetaType()))
+        .Change("<SET_INIT_VALUE>", GetSettingInitValue(*type.GetMetaType()));
   } else if (type.ToString() == "list") {
     code = ReplaceAll(CB_UNIT_MAP_LIST_READ)
-        .Change("<TYPE>", ConvertTypeToString(*type.GetMetaType()));
+        .Change("<TYPE>", ConvertTypeToString(*type.GetMetaType()))
+        .Change("<SET_INIT_VALUE>", GetSettingInitValue(*type.GetMetaType()));
   } else if (type.ToString() == "map") {
     code = ReplaceAll(CB_UNIT_MAP_MAP_READ)
         .Change("<KEY_TYPE>", ConvertTypeToString(*type.GetKeyType()))

diff --git a/idlc/gen/version2/cpp_generator_base_cb.hh b/idlc/gen/version2/cpp_generator_base_cb.hh
index 237da748844dcc7f1a75aa77404db06c317e6cf1..99703bdc4a30f515d2128dc6835b4a0bd6a86090 100644 (file)
--- a/idlc/gen/version2/cpp_generator_base_cb.hh
+++ b/idlc/gen/version2/cpp_generator_base_cb.hh
@@ -764,7 +764,7 @@ int tmp_size = 0;
 unit_map.Read("size", tmp_size);
 
 for (int index = 0; index < tmp_size; ++index) {
-  <TYPE> tmp_value;
+  <TYPE> tmp_value<SET_INIT_VALUE>;
   unit_map.Read(std::to_string(index), tmp_value);
   value.push_back(tmp_value);
 }
@@ -779,7 +779,7 @@ int tmp_length = 0;
 unit_map.Read("length", tmp_length);
 
 for (int index = 0; index < tmp_length; ++index) {
-  <TYPE> tmp_value;
+  <TYPE> tmp_value<SET_INIT_VALUE>;
   unit_map.Read(std::to_string(index), tmp_value);
   value.push_back(tmp_value);
 }

diff --git a/idlc/gen/version2/cpp_stub_body_generator.cc b/idlc/gen/version2/cpp_stub_body_generator.cc
index a5cc93c8fe3b142e87293866c2a617d58c1e41b3..591a43ad0fa22641120de9fe767d1b72b9e5d0c2 100644 (file)
--- a/idlc/gen/version2/cpp_stub_body_generator.cc
+++ b/idlc/gen/version2/cpp_stub_body_generator.cc
@@ -294,7 +294,8 @@ std::string CppStubBodyGenerator::GenInterfaceServiceBaseDeserialize(
     } else {
       code += ReplaceAll(CB_INTERFACE_SERVICE_BASE_PARAM_BASE)
           .Change("<TYPE>", ConvertTypeToString(type))
-          .Change("<NAME>", param->GetID());
+          .Change("<NAME>", param->GetID())
+          .Change("<SET_INIT_VALUE>", GetSettingInitValue(type));
     }
 
     if (param->GetParameterType().GetDirection() ==

diff --git a/idlc/gen/version2/cpp_stub_body_generator_cb.hh b/idlc/gen/version2/cpp_stub_body_generator_cb.hh
index 55bf4543a410548ee90db1d3ebe86bf91e8a00b1..42810f10332e9aa40aca7e340422c08cab56ac2c 100644 (file)
--- a/idlc/gen/version2/cpp_stub_body_generator_cb.hh
+++ b/idlc/gen/version2/cpp_stub_body_generator_cb.hh
@@ -523,7 +523,7 @@ map_.Write("<NAME>", <NAME>);
  */
 constexpr const char CB_INTERFACE_SERVICE_BASE_PARAM_BASE[] =
 R"__cpp_cb(
-<TYPE> <NAME>;
+<TYPE> <NAME><SET_INIT_VALUE>;
 )__cpp_cb";
 
 /**