Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes for Visual Studio

This commit is contained in:
Jan Steemann 2014-10-28 11:02:05 +01:00
parent ccd20d7638
commit d3c945d1d3
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arangod/RestServer/arango.cpp
View File

@ -62,7 +62,7 @@ static bool IsRunning = false;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifdef _WIN32 #ifdef _WIN32
static string ServiceName = "ArangoDB"; static std::string ServiceName = "ArangoDB";
#endif #endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -164,17 +164,17 @@ static void TRI_GlobalExitFunction(int exitCode, void* data) {
#ifdef _WIN32 #ifdef _WIN32
static void InstallServiceCommand (string command) { static void InstallServiceCommand (std::string command) {
string friendlyServiceName = "ArangoDB - the multi-purpose database"; std::string friendlyServiceName = "ArangoDB - the multi-purpose database";
cout << "INFO: adding service '" << friendlyServiceName std::cout << "INFO: adding service '" << friendlyServiceName
<< "' (internal '" << ServiceName << "')" << "' (internal '" << ServiceName << "')"
<< endl; << std::endl;
SC_HANDLE schSCManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS); SC_HANDLE schSCManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS);
if (schSCManager == 0) { if (schSCManager == 0) {
cerr << "FATAL: OpenSCManager failed with " << GetLastError() << endl; std::cerr << "FATAL: OpenSCManager failed with " << GetLastError() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -196,14 +196,14 @@ static void InstallServiceCommand (string command) {
CloseServiceHandle(schSCManager); CloseServiceHandle(schSCManager);
if (schService == 0) { if (schService == 0) {
cerr << "FATAL: CreateServiceA failed with " << GetLastError() << endl; std::cerr << "FATAL: CreateServiceA failed with " << GetLastError() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
SERVICE_DESCRIPTION description = { "multi-purpose NoSQL database (version " TRI_VERSION ")" }; SERVICE_DESCRIPTION description = { "multi-purpose NoSQL database (version " TRI_VERSION ")" };
ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &description); ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &description);
cout << "INFO: added service with command line '" << command << "'" << endl; std::cout << "INFO: added service with command line '" << command << "'" << std::endl;
CloseServiceHandle(schService); CloseServiceHandle(schService);
} }
@ -220,12 +220,12 @@ static void InstallService (int argc, char* argv[]) {
CHAR path[MAX_PATH]; CHAR path[MAX_PATH];
if(! GetModuleFileNameA(NULL, path, MAX_PATH)) { if(! GetModuleFileNameA(NULL, path, MAX_PATH)) {
cerr << "FATAL: GetModuleFileNameA failed" << endl; std::cerr << "FATAL: GetModuleFileNameA failed" << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// build command // build command
string command; std::string command;
command += "\""; command += "\"";
command += path; command += path;
@ -246,12 +246,12 @@ static void InstallService (int argc, char* argv[]) {
#ifdef _WIN32 #ifdef _WIN32
static void DeleteService (int argc, char* argv[]) { static void DeleteService (int argc, char* argv[]) {
cout << "INFO: removing service '" << ServiceName << "'" << endl; std::cout << "INFO: removing service '" << ServiceName << "'" << std::endl;
SC_HANDLE schSCManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS); SC_HANDLE schSCManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS);
if (schSCManager == 0) { if (schSCManager == 0) {
cerr << "FATAL: OpenSCManager failed with " << GetLastError() << endl; std::cerr << "FATAL: OpenSCManager failed with " << GetLastError() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -263,12 +263,12 @@ static void DeleteService (int argc, char* argv[]) {
CloseServiceHandle(schSCManager); CloseServiceHandle(schSCManager);
if (schService == 0) { if (schService == 0) {
cerr << "FATAL: OpenServiceA failed with " << GetLastError() << endl; std::cerr << "FATAL: OpenServiceA failed with " << GetLastError() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (! DeleteService(schService)) { if (! DeleteService(schService)) {
cerr << "FATAL: DeleteService failed with " << GetLastError() << endl; std::cerr << "FATAL: DeleteService failed with " << GetLastError() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -440,7 +440,7 @@ int main (int argc, char* argv[]) {
ARGV = argv; ARGV = argv;
if (! StartServiceCtrlDispatcher(ste)) { if (! StartServiceCtrlDispatcher(ste)) {
cerr << "FATAL: StartServiceCtrlDispatcher has failed with " << GetLastError() << endl; std::cerr << "FATAL: StartServiceCtrlDispatcher has failed with " << GetLastError() << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }

2
lib/Rest/EndpointIp.cpp
View File

@ -238,7 +238,7 @@ TRI_socket_t EndpointIp::connect (double connectTimeout,
hints.ai_flags = TRI_CONNECT_AI_FLAGS; hints.ai_flags = TRI_CONNECT_AI_FLAGS;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
string portString = StringUtils::itoa(_port); std::string portString = StringUtils::itoa(_port);
error = getaddrinfo(_host.c_str(), portString.c_str(), &hints, &result); error = getaddrinfo(_host.c_str(), portString.c_str(), &hints, &result);