external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Remove warning: C++11 requires a space between string literal and macro (#874)

Browse source 
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
This commit is contained in:
HungMingWu 2017-05-06 14:05:22 +08:00 • committed by winlin
parent a58874178b
commit 815d50f00a
32 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/src/app/srs_app_config.cpp
View file

@ -56,7 +56,7 @@ using namespace std;
using namespace _srs_internal;
// @global the version to identify the core.
const char* _srs_version = "XCORE-"RTMP_SIG_SRS_SERVER;
const char* _srs_version = "XCORE-" RTMP_SIG_SRS_SERVER;
#define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog"
@ -3488,12 +3488,12 @@ int SrsConfig::parse_argv(int& i, char** argv)
void SrsConfig::print_help(char** argv)
{
printf(
RTMP_SIG_SRS_SERVER" "RTMP_SIG_SRS_COPYRIGHT"\n"
"License: "RTMP_SIG_SRS_LICENSE"\n"
"Primary: "RTMP_SIG_SRS_PRIMARY"\n"
"Authors: "RTMP_SIG_SRS_AUTHROS"\n"
"Build: "SRS_AUTO_BUILD_DATE" Configuration:"SRS_AUTO_USER_CONFIGURE"\n"
"Features:"SRS_AUTO_CONFIGURE"\n""\n"
RTMP_SIG_SRS_SERVER " " RTMP_SIG_SRS_COPYRIGHT "\n"
"License: " RTMP_SIG_SRS_LICENSE "\n"
"Primary: " RTMP_SIG_SRS_PRIMARY "\n"
"Authors: " RTMP_SIG_SRS_AUTHROS "\n"
"Build: " SRS_AUTO_BUILD_DATE " Configuration:" SRS_AUTO_USER_CONFIGURE "\n"
"Features:" SRS_AUTO_CONFIGURE "\n""\n"
"Usage: %s [-h?vVsS] [[-t] -c <filename>]\n"
"\n"
"Options:\n"
@ -3506,14 +3506,14 @@ void SrsConfig::print_help(char** argv)
" -p rtmp-port : the rtmp port to listen.\n"
" -x http-port : the http port to listen.\n"
"\n"
RTMP_SIG_SRS_WEB"\n"
RTMP_SIG_SRS_URL"\n"
"Email: "RTMP_SIG_SRS_EMAIL"\n"
RTMP_SIG_SRS_WEB "\n"
RTMP_SIG_SRS_URL "\n"
"Email: " RTMP_SIG_SRS_EMAIL "\n"
"\n"
"For example:\n"
" %s -v\n"
" %s -t -c "SRS_CONF_DEFAULT_COFNIG_FILE"\n"
" %s -c "SRS_CONF_DEFAULT_COFNIG_FILE"\n",
" %s -t -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n"
" %s -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n",
argv[0], argv[0], argv[0], argv[0]);
}
@ -3679,7 +3679,7 @@ int SrsConfig::check_normal_config()
////////////////////////////////////////////////////////////////////////
if (get_heartbeat_interval() <= 0) {
ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("directive heartbeat interval invalid, interval=%"PRId64", ret=%d",
srs_error("directive heartbeat interval invalid, interval=%" PRId64 ", ret=%d",
get_heartbeat_interval(), ret);
return ret;
}
@ -6992,7 +6992,7 @@ int64_t SrsConfig::get_heartbeat_interval()
string SrsConfig::get_heartbeat_url()
{
static string DEFAULT = "http://"SRS_CONSTS_LOCALHOST":8085/api/v1/servers";
static string DEFAULT = "http://" SRS_CONSTS_LOCALHOST ":8085/api/v1/servers";
SrsConfDirective* conf = get_heartbeart();
if (!conf) {