From b9251e91716eb8a392039672f71d4647b46dfe10 Mon Sep 17 00:00:00 2001
From: ruanshudong <ruanshudong@qq.com>
Date: Tue, 30 Apr 2024 08:54:54 +0800
Subject: [PATCH] fix compiler bug in tarscpp v3.0.20

---
 CMakeLists.txt               | 2 ++
 src/CMakeLists.txt           | 6 +++---
 src/tupproxy/TupBase.cpp     | 2 +-
 src/tupproxy/TupCallback.cpp | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b84ea7..708bc57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,9 @@ endif()
 
 include_directories(/usr/local/tars/cpp/thirdparty/include)
 link_directories(/usr/local/tars/cpp/thirdparty/lib)
+if(LINUX)
 link_directories(/lib/x86_64-linux-gnu)
+endif()
 
 add_subdirectory(src)
 add_subdirectory(test)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e092f2..98e0cb0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,8 +7,8 @@ set(CMAKE_BUILD_TYPE "Debug")
 
 gen_server("Base" "GatewayServer")
 
-target_link_libraries(GatewayServer mysqlclient dl)
+# target_link_libraries(GatewayServer mysqlclient dl)
 
-# if(UNIX AND NOT APPLE)
-#     target_link_libraries(GatewayServer -static-libgcc -static-libstdc++)
+# if(LINUX)
+    # target_link_libraries(GatewayServer -static-libgcc -static-libstdc++)
 # endif()
diff --git a/src/tupproxy/TupBase.cpp b/src/tupproxy/TupBase.cpp
index 094ef66..4d2ffd5 100755
--- a/src/tupproxy/TupBase.cpp
+++ b/src/tupproxy/TupBase.cpp
@@ -700,7 +700,7 @@ void TupBase::tupAsyncCall(const shared_ptr<RequestPacket> &tup, ServantPrx prox
                 _trace_param_ = "{\"trace_param_over_max_len\":true, \"data_len\":" + TC_Common::tostr(tup->sBuffer.size()) + "}";
             }
             
-            TARS_TRACE(traceKey, TRACE_ANNOTATION_TS, ServerConfig::Application + "." + ServerConfig::ServerName, tup->sServantName, tup->sFuncName, 0, _trace_param_, "");
+            TARS_TRACE(traceKey, TRACE_ANNOTATION_TS, ServerConfig::Application + "." + ServerConfig::ServerName, tup->sServantName, tup->sFuncName.c_str(), 0, _trace_param_, "");
             TLOG_DEBUG("trace===>" << traceKey << ", " << tup->sServantName << ":" << tup->sFuncName << endl);
 
             cb->setTraceKey(traceKey);
diff --git a/src/tupproxy/TupCallback.cpp b/src/tupproxy/TupCallback.cpp
index 46fb0bc..b249bde 100755
--- a/src/tupproxy/TupCallback.cpp
+++ b/src/tupproxy/TupCallback.cpp
@@ -100,7 +100,7 @@ int TupCallback::onDispatch(ReqMessagePtr msg)
             _trace_param_ = "{\"trace_param_over_max_len\":true, \"data_len\":" + TC_Common::tostr(msg->response->sBuffer.size()) + "}";
         }
         
-        TARS_TRACE(getTraceKey(), TRACE_ANNOTATION_TE, ServerConfig::Application + "." + ServerConfig::ServerName, _stParam->sServantName, _stParam->sFuncName, msg->response->iRet, _trace_param_, ""); 
+        TARS_TRACE(getTraceKey(), TRACE_ANNOTATION_TE, ServerConfig::Application + "." + ServerConfig::ServerName, _stParam->sServantName, _stParam->sFuncName.c_str(), msg->response->iRet, _trace_param_, ""); 
     }
 
     return 0;