Commit 5ead31da authored by Peter Kuemmel's avatar Peter Kuemmel

Ninja: try work around for bcc32 bug

parent 1333b576
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#include <signal.h> #include <signal.h>
#endif #endif
// bcc32 only finds remove(const char*)
namespace stlport { }
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned __int64 cmULONG_PTR; typedef unsigned __int64 cmULONG_PTR;
#else #else
...@@ -429,8 +433,10 @@ bool SubprocessSet::DoWork() { ...@@ -429,8 +433,10 @@ bool SubprocessSet::DoWork() {
subproc->OnPipeReady(); subproc->OnPipeReady();
if (subproc->Done()) { if (subproc->Done()) {
using namespace std;
using namespace stlport;
std::vector<Subprocess*>::iterator end = std::vector<Subprocess*>::iterator end =
std::remove(running_.begin(), running_.end(), subproc); remove(running_.begin(), running_.end(), subproc);
if (running_.end() != end) { if (running_.end() != end) {
finished_.push(subproc); finished_.push(subproc);
running_.resize(end - running_.begin()); running_.resize(end - running_.begin());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment