diff --git a/src/.DS_Store b/src/.DS_Store index f04e1d94..84641cf3 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ diff --git a/src/Common/config.cpp b/src/Common/config.cpp index bb30b1ec..caab23fd 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -11,7 +11,7 @@ using namespace ZL::Network; namespace Config { -void loaIniConfig(){ +void loadIniConfig(){ auto &ini = ZL::Util::mINI::Instance(); try{ ini.parseFile(exePath() + ".ini"); diff --git a/src/Common/config.h b/src/Common/config.h index 030b6f8b..6e6ff51e 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -14,7 +14,7 @@ using namespace ZL::Util; namespace Config { -void loaIniConfig(); +void loadIniConfig(); ////////////TCP最大连接数/////////// #ifdef __x86_64__ #define MAX_TCP_SESSION 100000 diff --git a/tests/.DS_Store b/tests/.DS_Store index d7f2a65a..f46f9d97 100644 Binary files a/tests/.DS_Store and b/tests/.DS_Store differ diff --git a/tests/test_server.cpp b/tests/test_server.cpp index 0fbafe41..880181e8 100644 --- a/tests/test_server.cpp +++ b/tests/test_server.cpp @@ -45,7 +45,7 @@ int main(int argc,char *argv[]){ setExePath(argv[0]); signal(SIGINT, programExit); Logger::Instance().add(std::make_shared("stdout", LTrace)); - Config::loaIniConfig(); + Config::loadIniConfig(); DebugL << exePath(); //support rtmp and rtsp url //just support H264+AAC