merge srs2

2016-09-23 15:47:17 +08:00 · 2016-09-23 15:47:17 +08:00 · 9cc528cd33
commit 9cc528cd33
parent 0e308b0fa1 3659eec9d1
1 changed files with 2 additions and 0 deletions
--- a/trunk/src/main/srs_main_server.cpp
+++ b/trunk/src/main/srs_main_server.cpp
@ -37,6 +37,8 @@ using namespace std;
    #include <gperftools/profiler.h>
 #endif

+using namespace std;
+
 #include <srs_kernel_error.hpp>
 #include <srs_app_server.hpp>
 #include <srs_app_config.hpp>