Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

chenshijun

2019-03-30 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d

 QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp

@@ -14,7 +14,7 @@

::YoloDetect::ObjInfos
YoloDetectServerI::YoloDetect(::Ice::Int w, ::Ice::Int h, const ::std::string &shM, const ::Ice::Current &) {
    ClockTimer ct("YoloDetectServerI::YoloDetect");
//    ClockTimer ct("YoloDetectServerI::YoloDetect");

//    std::thread::id key = std::this_thread::get_id();
//    DBG("key is " << key);