diff --git a/launcher/main/LauncherApplication.C b/launcher/main/LauncherApplication.C index dd384f391e95ca49e452520c471828aa65ee4a48..18ce0dc3d701155ed6411c12c15eae04d14099b2 100644 --- a/launcher/main/LauncherApplication.C +++ b/launcher/main/LauncherApplication.C @@ -271,7 +271,7 @@ LauncherApplication::~LauncherApplication() delete launchExecutor; delete connectSimExecutor; - for(int i = 0; i < childOutput.size(); ++i) + for(size_t i = 0; i < childOutput.size(); ++i) delete childOutput[i]; } @@ -505,7 +505,7 @@ LauncherApplication::MainLoop() ConnectionGroup connGroup; connGroup.AddConnection(parent.GetWriteConnection()); #ifndef _WIN32 - for(int i = 0; i < childOutput.size(); ++i) + for(size_t i = 0; i < childOutput.size(); ++i) connGroup.AddConnection(childOutput[i]); #endif // Check the connections for input that needs to be processed. @@ -539,7 +539,7 @@ LauncherApplication::MainLoop() bool *valid = new bool[childOutput.size()]; // Gather all of the output from each child in sequence. - for(int i = 0; i < childOutput.size(); ++i) + for(size_t i = 0; i < childOutput.size(); ++i) { valid[i] = true; if(connGroup.NeedsRead(i + 1)) @@ -583,7 +583,7 @@ LauncherApplication::MainLoop() // it. std::string completeOutput; std::vector validConnections; - for(int i = 0; i < childOutput.size(); ++i) + for(size_t i = 0; i < childOutput.size(); ++i) { // Append the output to a complete output that we'll send // to the client. @@ -591,7 +591,7 @@ LauncherApplication::MainLoop() { debug5 << "CHILD OUTPUT[" << i << "]: " << outputs[i].c_str() << endl; completeOutput += outputs[i]; - if(outputs[i][outputs[i].size()-1] != '\n' && i < childOutput.size()-1) + if(outputs[i][outputs[i].size()-1] != '\n' && (size_t)i < childOutput.size()-1) completeOutput += std::string("\n"); } diff --git a/launcher/rpc/LauncherState.C b/launcher/rpc/LauncherState.C index 11c8a4abbe6dd0ed3fdeedc53022da16431a912c..7d19b9f2dc546dcad10895dda1563237761504c6 100644 --- a/launcher/rpc/LauncherState.C +++ b/launcher/rpc/LauncherState.C @@ -19,7 +19,7 @@ LauncherState::SetupComponentRPCs(Xfer* xfer) // // Connect the RPCs to the xfer object. // - for(int i = 0; i < GetNumStateObjects(); ++i) + for(size_t i = 0; i < GetNumStateObjects(); ++i) xfer->Add(GetStateObject(i)); } @@ -32,7 +32,7 @@ LauncherState::GetNumStateObjects() VisItRPC* LauncherState::GetStateObject(int i) { - return (i >= 0 && i < objVector.size()) ? + return (i >= 0 && (size_t)i < objVector.size()) ? objVector[i] : 0; }