修正编译问题

修正：
1. deploy_tars.sh在 tars 没有编译成功时，仍返回正确的问题，该问题会导致 deploy 带着缺失 tars 的错误继续向下执行
2. 修正Tseer和 TseerAgent 的 CMakeLists.txt缺少-std=c++11选项的问题
3. 修正 TseerAgent 里一处makepair 显示指定类型导致类型推断错误的问题

Author: troycheng

TseerAgent/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(TseerAgent)
 
-set(CMAKE_CXX_FLAGS "-g -O2 -Wall -Wno-deprecated")
+set(CMAKE_CXX_FLAGS "-std=c++11 -g -O2 -Wall -Wno-deprecated")
 
 add_definitions(-DTARS_VERSION="${TARS_VERSION}" -DOS_VERSION="${OS_VERSION}")
 

TseerAgent/src/HeartBeatReportThread.cpp

@@ -109,7 +109,7 @@ void HeartBeatReportThread::run()
                     {
                         keys += (*it) + ";";
                     }
-                    apiKeyContext.insert(std::make_pair<string, string>("KEY_INFO", keys));
+                    apiKeyContext.insert(std::make_pair("KEY_INFO", keys));
                     ret = _registryPrx->keepAliveExt(nodeInfo, apiKeyContext);
                     TSEER_LOG(HEART_BEAST_LOG)->debug() << FILE_FUN << "Agent report api keys success:" << keys << endl;
 

build/CMakeLists.txt

@@ -38,7 +38,7 @@ set(OS_VERSION "CentOs-6.5-64")
 # tars框架版本//todo
 set(TARS_VERSION "1.0.1")
 
-set(CMAKE_CXX_FLAGS "-g -O2 -Wall -Wno-deprecated")
+set(CMAKE_CXX_FLAGS "-std=c++11 -g -O2 -Wall -Wno-deprecated")
 
 #调用tars2cpp, 生成tars对应的文件
 macro(complice_tars OUT_DEPENDS_LIST HEADER)

build/cmake/deploy_tars.sh

@@ -27,7 +27,11 @@ INSTALLTARSPATH=$(pwd)/../thirdparty/tars/
 
 TIMESTAMP=`date "+%F %T"`
 echo "[INFO] $TIMESTAMP building tars into $INSTALLTARSPATH ..."
-cd ./Tars/cpp/build; cp CMakeLists.txt ../; cmake .. -DCMAKE_INSTALL_PREFIX=$INSTALLTARSPATH; make; make; make install;
+cd ./Tars/cpp/build && cp CMakeLists.txt ../ && cmake .. -DCMAKE_INSTALL_PREFIX=$INSTALLTARSPATH && make && make install;
+if [ "$?" -ne "0" ]; then
+	echo "[ERROR] $TIMESTAMP Compile Tars failed."
+	exit 3
+fi
 
 rm -rf Tars