mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-04 22:56:37 +00:00
added std:: to a lot of locations which where
missed and added NOMINMAX to cmakelist
This commit is contained in:
@@ -315,6 +315,9 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker TinyXML)
|
||||
|
||||
ADD_LIBRARY(Common ${common_sources} ${common_headers})
|
||||
|
||||
IF(MSVC)
|
||||
ADD_DEFINITIONS(-DNOMINMAX)
|
||||
ENDIF(MSVC)
|
||||
|
||||
IF(UNIX)
|
||||
ADD_DEFINITIONS(-fPIC)
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <time.h>
|
||||
#include <sys/types.h>
|
||||
#ifdef _WINDOWS
|
||||
#include <time.h>
|
||||
|
||||
@@ -165,8 +165,8 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
|
||||
// Create the child process.
|
||||
|
||||
//glue together all the nice command line arguments
|
||||
string args(it->program);
|
||||
vector<string>::iterator cur, end;
|
||||
std::string args(it->program);
|
||||
std::vector<std::string>::iterator cur, end;
|
||||
cur = it->args.begin();
|
||||
end = it->args.end();
|
||||
for(; cur != end; cur++) {
|
||||
|
||||
Reference in New Issue
Block a user