use TARS_STD_SHARED_PTR

TarsCloud · Feb 23, 2024 · 98dc06f · 98dc06f
1 parent 185acd6
commit 98dc06f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/cmake/Common.cmake b/cmake/Common.cmake
@@ -11,10 +11,10 @@ IF (CMAKE_BUILD_TYPE STREQUAL "")
 ENDIF()
 
 
-# 设置一个选项，用于控制是否定义 BUILD_STD_SHARED_PTR 宏
-option(USE_STD_SHARED_PTR "Use std::shared_ptr instead of tars::AutoPtr" OFF)
-if(USE_STD_SHARED_PTR)
-    add_definitions(-DBUILD_STD_SHARED_PTR)
+# 设置一个选项，用于控制是否定义 TARS_STD_SHARED_PTR 宏
+option(TARS_STD_SHARED_PTR "Use std::shared_ptr instead of tars::AutoPtr" OFF)
+if(TARS_STD_SHARED_PTR)
+    add_definitions(-DTARS_STD_SHARED_PTR)
 endif()
 
 
@@ -126,6 +126,6 @@ message("BIN:                       ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 message("TARS2CPP:                  ${TARS2CPP}") 
 #message("TARS_OPENTRACKING:         ${TARS_OPENTRACKING}")
 message("ONLY_LIB:                  ${ONLY_LIB}" )
-message("USE_STD_SHARED_PTR:        ${USE_STD_SHARED_PTR}" )
+message("TARS_STD_SHARED_PTR:       ${TARS_STD_SHARED_PTR}" )
 #-------------------------------------------------------------
 
diff --git a/servant/libservant/EndpointManager.cpp b/servant/libservant/EndpointManager.cpp
@@ -429,7 +429,7 @@ void QueryEpBase::refreshReg(GetEndpointType type, const string & sName)
                 {
                     case E_ALL:
                         {
-#if USE_STD_SHARED_PTR
+#if TARS_STD_SHARED_PTR
                             _queryFPrx->async_findObjectById4Any(shared_from_this(),_objName, _communicator->getClientConfig().Context);
 #else
                             _queryFPrx->async_findObjectById4Any(this,_objName, _communicator->getClientConfig().Context);
@@ -438,7 +438,7 @@ void QueryEpBase::refreshReg(GetEndpointType type, const string & sName)
                         }
                     case E_STATION:
                         {
-#if USE_STD_SHARED_PTR
+#if TARS_STD_SHARED_PTR
                             _queryFPrx->async_findObjectByIdInSameStation(shared_from_this(),_objName,sName, _communicator->getClientConfig().Context);
 #else
                             _queryFPrx->async_findObjectByIdInSameStation(this,_objName,sName, _communicator->getClientConfig().Context);
@@ -447,7 +447,7 @@ void QueryEpBase::refreshReg(GetEndpointType type, const string & sName)
                         }
                     case E_SET:
                         {
-#if USE_STD_SHARED_PTR
+#if TARS_STD_SHARED_PTR
                             _queryFPrx->async_findObjectByIdInSameSet(shared_from_this(),_objName,sName, _communicator->getClientConfig().Context);
 #else
                         _queryFPrx->async_findObjectByIdInSameSet(this,_objName,sName, _communicator->getClientConfig().Context);
@@ -461,15 +461,15 @@ void QueryEpBase::refreshReg(GetEndpointType type, const string & sName)
                             {
                                 //指定set调用时，指定set的优先级最高
                                 string setId = _invokeSetId.empty()?_communicator->getClientConfig().SetDivision:_invokeSetId;
-#if USE_STD_SHARED_PTR
+#if TARS_STD_SHARED_PTR
                                 _queryFPrx->async_findObjectByIdInSameSet(shared_from_this(),_objName,setId, _communicator->getClientConfig().Context);
 #else
                                 _queryFPrx->async_findObjectByIdInSameSet(this,_objName,setId, _communicator->getClientConfig().Context);
 #endif
                             }
                             else
                             {
-#if USE_STD_SHARED_PTR
+#if TARS_STD_SHARED_PTR
                                 _queryFPrx->async_findObjectByIdInSameGroup(shared_from_this(),_objName, _communicator->getClientConfig().Context);
 #else
                                 _queryFPrx->async_findObjectByIdInSameGroup(this,_objName, _communicator->getClientConfig().Context);

diff --git a/servant/libservant/ServantHelper.cpp b/servant/libservant/ServantHelper.cpp
@@ -47,7 +47,7 @@ ServantPtr ServantHelperManager::create(const string &sAdapter)
     //根据adapter查找servant名称
     string s = _adapter_servant[sAdapter];
 
-#ifdef BUILD_STD_SHARED_PTR
+#ifdef TARS_STD_SHARED_PTR
     if(_servant_ptr.find(s) != _servant_ptr.end())
     {
         ServantPtr ptr = _servant_ptr[s];

diff --git a/servant/servant/Global.h b/servant/servant/Global.h
@@ -67,7 +67,7 @@ typedef TC_AutoPtr<Communicator> CommunicatorPtr;
 typedef TC_AutoPtr<ServantProxy> ServantPrx;
 typedef TC_AutoPtr<StatFProxy> StatFPrx;
 
-#ifdef BUILD_STD_SHARED_PTR
+#ifdef TARS_STD_SHARED_PTR
 
 typedef std::shared_ptr<ServantProxyCallback> ServantProxyCallbackPtr;
 typedef std::shared_ptr<ObjectProxy> ObjectPrx;

diff --git a/tools/tars2cpp/tars2cpp.cpp b/tools/tars2cpp/tars2cpp.cpp
@@ -2785,7 +2785,7 @@ string Tars2Cpp::generateHPromiseAsync(const InterfacePtr &pInter, const Operati
     DEL_TAB;
     s << TAB << "};" << endl;
     s << TAB << endl;
-#ifdef BUILD_STD_SHARED_PTR
+#ifdef TARS_STD_SHARED_PTR
     s << TAB << "typedef std::shared_ptr< " << pInter->getId() << "PrxCallbackPromise::Promise" << sStruct << " > Promise" << sStruct << "Ptr;" << endl;
 #else
     s << TAB << "typedef tars::TC_AutoPtr< " << pInter->getId() << "PrxCallbackPromise::Promise" << sStruct << " > Promise" << sStruct << "Ptr;" << endl;
@@ -2996,7 +2996,7 @@ string Tars2Cpp::generateH(const InterfacePtr &pPtr, const NamespacePtr &nPtr) c
     DEL_TAB;
     s << TAB << "};" << endl;
 
-#ifdef BUILD_STD_SHARED_PTR
+#ifdef TARS_STD_SHARED_PTR
     s << TAB << "typedef std::shared_ptr<" << pPtr->getId() << "PrxCallback> " << pPtr->getId() << "PrxCallbackPtr;" << endl;
 #else
     s << TAB << "typedef tars::TC_AutoPtr<" << pPtr->getId() << "PrxCallback> " << pPtr->getId() << "PrxCallbackPtr;" << endl;
@@ -3060,7 +3060,7 @@ string Tars2Cpp::generateH(const InterfacePtr &pPtr, const NamespacePtr &nPtr) c
     DEL_TAB;
     s << TAB << "};" << endl;
 
-#ifdef BUILD_STD_SHARED_PTR
+#ifdef TARS_STD_SHARED_PTR
     s << TAB << "typedef std::shared_ptr<" << pPtr->getId() << "PrxCallbackPromise> " << pPtr->getId() << "PrxCallbackPromisePtr;" << endl;
 #else
     s << TAB << "typedef tars::TC_AutoPtr<" << pPtr->getId() << "PrxCallbackPromise> " << pPtr->getId() << "PrxCallbackPromisePtr;" << endl;
@@ -3151,7 +3151,7 @@ string Tars2Cpp::generateH(const InterfacePtr &pPtr, const NamespacePtr &nPtr) c
     DEL_TAB;
 
     s << TAB << "};" << endl;
-#ifdef BUILD_STD_SHARED_PTR
+#ifdef TARS_STD_SHARED_PTR
     s << TAB << "typedef std::shared_ptr<" << pPtr->getId() << "CoroPrxCallback> " << pPtr->getId() << "CoroPrxCallbackPtr;" << endl;
 #else
     s << TAB << "typedef tars::TC_AutoPtr<" << pPtr->getId() << "CoroPrxCallback> " << pPtr->getId() << "CoroPrxCallbackPtr;" << endl;