From 1ce4174d6c1d31e2d3531e8b7d8cb91ec60d2dfb Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Fri, 15 Mar 2024 10:05:33 +0900
Subject: [PATCH] Increase c++ version to 17

Dibs can support c++17.

Change-Id: Ia040c73cadb68045a894df604e8704b412718dc9
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 Makefile.dibs                   | 2 +-
 idlc/CMakeLists.txt             | 2 +-
 idlc/gen/c_proxy_body_gen.cc    | 4 ++--
 tests/unit_tests/CMakeLists.txt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.dibs b/Makefile.dibs
index 7313ce3..a98690c 100644
--- a/Makefile.dibs
+++ b/Makefile.dibs
@@ -12,7 +12,7 @@ INCS := \
 	-I$(CURDIR)
 
 CXXFLAGS := \
-	-O2 -Wall -Wno-unused-function -Wno-sign-compare -std=c++11 -DFULLVER=\"$(FULLVER)\"
+	-O2 -Wall -Wno-unused-function -Wno-sign-compare -std=c++17 -DFULLVER=\"$(FULLVER)\"
 
 OBJDIR := build
 BINDIR := build/idlc
diff --git a/idlc/CMakeLists.txt b/idlc/CMakeLists.txt
index 00c4ca8..e55bfed 100644
--- a/idlc/CMakeLists.txt
+++ b/idlc/CMakeLists.txt
@@ -17,7 +17,7 @@ ENDIF(DEFINED BUILD_WIN)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wno-unused-function -Wno-sign-compare")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++11")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++17")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
diff --git a/idlc/gen/c_proxy_body_gen.cc b/idlc/gen/c_proxy_body_gen.cc
index 94da9ad..78b224e 100644
--- a/idlc/gen/c_proxy_body_gen.cc
+++ b/idlc/gen/c_proxy_body_gen.cc
@@ -424,7 +424,7 @@ std::string CProxyBodyGen::GenMethodParcelWrite(const Interface& iface,
 
     std::string param_name =
         param_type.GetDirection() == ParameterType::Direction::REF
-            ? "*" + p->GetID() : p->GetID();
+            ? "(*" + p->GetID() + ")" : p->GetID();
     std::string parcel_write_code;
     auto& type = param_type.GetBaseType();
     if (IsDelegateType(iface, type) ||
@@ -433,7 +433,7 @@ std::string CProxyBodyGen::GenMethodParcelWrite(const Interface& iface,
         type.ToString() == "array") {
       parcel_write_code = ReplaceAll(
           CB_INTERFACE_METHOD_USER_DEFINED_PARCEL_WRITE, "<ARG>",
-          p->GetID());
+          param_name);
       std::string name = GetFullNameFromType(type, iface);
       parcel_write_code += GetPrivateSharingString(type, iface, "h->port",
           param_name);
diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index 6c5e2a6..c5ff08d 100644
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wno-unused-function -Wno-sign-compare")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wl,-zdefs" )
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fPIE")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror")
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++11")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++17")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 
 FIND_PACKAGE(GTest REQUIRED)
-- 
2.7.4