From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期二, 16 四月 2019 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

---
 QiaoJiaSystem/VptServer/main.cpp |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/VptServer/main.cpp b/QiaoJiaSystem/VptServer/main.cpp
index f60dc52..fc7ca74 100644
--- a/QiaoJiaSystem/VptServer/main.cpp
+++ b/QiaoJiaSystem/VptServer/main.cpp
@@ -30,7 +30,6 @@
 #define printExp(exp) cout<<#exp<<"涓�:\t\t"<<(exp)<<endl
 #define printExpToString(exp) cout<<(string(#exp)+"涓�:\t\t")<<(exp).toString()<<endl //娉ㄦ剰exp鍔犳嫭鍙锋洿瀹夊叏
 
-
 int main(int argc, char **argv) {
 
     std::cout << __DATE__ << " " << __TIME__ << std::endl;
@@ -44,7 +43,6 @@
     appPref.setIntData("gpu.index", atoi(argv[1]));
     appPref.setIntData("RpcVptPort", atoi(argv[2]));
     appPref.setFloatData("thresh.detect", atof(argv[3]));
-
 
     IceRpcServer<VptServerI> server("vptServer", appPref.getIntData("RpcVptPort"), "tcp");
     server.setMessageSizeMax(1024 * 1024 * 50);

--
Gitblit v1.8.0