Compile fixes for C++11, from Rene Ladan

This commit is contained in:
David Anderson 2013-11-05 09:19:27 -08:00
parent 77012924ba
commit a3b2be239f
7 changed files with 11 additions and 8 deletions

View File

@ -120,7 +120,7 @@ using std::vector;
// CPPFLAGS=-DGETRUSAGE_IN_TIMER_THREAD
#endif
const char* api_version="API_VERSION_"PACKAGE_VERSION;
const char* api_version = "API_VERSION_" PACKAGE_VERSION;
static APP_INIT_DATA aid;
static FILE_LOCK file_lock;
APP_CLIENT_SHM* app_client_shm = 0;

View File

@ -73,7 +73,7 @@ extern void msg_printf_notice(PROJ_AM *p, bool is_html, const char* link, const
__attribute__ ((format (printf, 4, 5)))
;
#define _(x) "_(\""x"\")"
#define _(x) "_(\"" x "\")"
extern std::string app_list_string(PROJECT*);

View File

@ -892,7 +892,7 @@ void PROJECT::check_no_rsc_apps() {
}
}
// set no_X_apps for anonymous platform project
// set no_rsc_apps[] for anonymous platform project
//
void PROJECT::check_no_apps() {
for (int i=0; i<coprocs.n_rsc; i++) {

View File

@ -41,6 +41,7 @@
#include <cstdarg>
#include <cstdlib>
#include <unistd.h>
#include <time.h>
#endif
#ifdef _USING_FCGI_

View File

@ -31,6 +31,7 @@
#include <sys/un.h>
#include <cstdio>
#include <unistd.h>
#include <time.h>
#include <cstdlib>
#include <cstring>
#endif

View File

@ -29,6 +29,7 @@
#include <string>
#include <cmath>
#include <string.h>
#include <time.h>
#include <stdlib.h>
#include <ctype.h>
#endif

View File

@ -50,11 +50,6 @@ ASSIGN_NONE = 0
ASSIGN_HOST = 1
ASSIGN_USER = 2
ASSIGN_TEAM = 3
BATCH_STATE_INIT = 0
BATCH_STATE_IN_PROGRESS = 1
BATCH_STATE_COMPLETE = 2
BATCH_STATE_ABORTED = 3
BATCH_STATE_RETIRED = 4
GUI_RPC_PORT = 31416
RUN_MODE_ALWAYS = 1
RUN_MODE_AUTO = 2
@ -119,3 +114,8 @@ RPC_REASON_TRICKLE_UP = 4
RPC_REASON_ACCT_MGR_REQ = 5
RPC_REASON_INIT = 6
RPC_REASON_PROJECT_REQ = 7
BATCH_STATE_INIT = 0
BATCH_STATE_IN_PROGRESS = 1
BATCH_STATE_COMPLETE = 2
BATCH_STATE_ABORTED = 3
BATCH_STATE_RETIRED = 4