From 087f7740b76bd36121e131486fccbb344b60b830 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 17 Sep 2015 11:41:23 +0800 Subject: [PATCH] fix the build failed bug --- trunk/auto/options.sh | 2 +- trunk/src/app/srs_app_config.cpp | 1 - trunk/src/app/srs_app_config.hpp | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index c527cc2e6..d1e44c6ef 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -605,7 +605,7 @@ function apply_user_presets() { SRS_HTTP_API=YES SRS_LIBRTMP=YES SRS_RESEARCH=NO - SRS_UTEST=NO + SRS_UTEST=YES SRS_GPERF=NO SRS_GPERF_MC=NO SRS_GPERF_MP=NO diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 1fc7680dd..31b5d0390 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -436,7 +436,6 @@ SrsConfDirective* SrsConfDirective::copy() cp->conf_line = conf_line; cp->name = name; cp->args = args; - cp->create_time = create_time; for (int i = 0; i < (int)directives.size(); i++) { SrsConfDirective* directive = directives.at(i); diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index e05c770fa..0bbf01032 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -189,6 +189,10 @@ private: * 3. if ret flag indicates there are child-directives, read_conf(directive, block) recursively. */ virtual int parse_conf(_srs_internal::SrsConfigBuffer* buffer, SrsDirectiveType type); + /** + * deep copy the directive. + */ + virtual SrsConfDirective* copy(); /** * read a token from buffer. * a token, is the directive args and a flag indicates whether has child-directives.