Commit 008d70c9 authored by hkrishna's avatar hkrishna

warning fixes for launcher directory

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23640 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3866f884
...@@ -271,7 +271,7 @@ LauncherApplication::~LauncherApplication() ...@@ -271,7 +271,7 @@ LauncherApplication::~LauncherApplication()
delete launchExecutor; delete launchExecutor;
delete connectSimExecutor; delete connectSimExecutor;
for(int i = 0; i < childOutput.size(); ++i) for(size_t i = 0; i < childOutput.size(); ++i)
delete childOutput[i]; delete childOutput[i];
} }
...@@ -505,7 +505,7 @@ LauncherApplication::MainLoop() ...@@ -505,7 +505,7 @@ LauncherApplication::MainLoop()
ConnectionGroup connGroup; ConnectionGroup connGroup;
connGroup.AddConnection(parent.GetWriteConnection()); connGroup.AddConnection(parent.GetWriteConnection());
#ifndef _WIN32 #ifndef _WIN32
for(int i = 0; i < childOutput.size(); ++i) for(size_t i = 0; i < childOutput.size(); ++i)
connGroup.AddConnection(childOutput[i]); connGroup.AddConnection(childOutput[i]);
#endif #endif
// Check the connections for input that needs to be processed. // Check the connections for input that needs to be processed.
...@@ -539,7 +539,7 @@ LauncherApplication::MainLoop() ...@@ -539,7 +539,7 @@ LauncherApplication::MainLoop()
bool *valid = new bool[childOutput.size()]; bool *valid = new bool[childOutput.size()];
// Gather all of the output from each child in sequence. // 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; valid[i] = true;
if(connGroup.NeedsRead(i + 1)) if(connGroup.NeedsRead(i + 1))
...@@ -583,7 +583,7 @@ LauncherApplication::MainLoop() ...@@ -583,7 +583,7 @@ LauncherApplication::MainLoop()
// it. // it.
std::string completeOutput; std::string completeOutput;
std::vector<Connection *> validConnections; std::vector<Connection *> 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 // Append the output to a complete output that we'll send
// to the client. // to the client.
...@@ -591,7 +591,7 @@ LauncherApplication::MainLoop() ...@@ -591,7 +591,7 @@ LauncherApplication::MainLoop()
{ {
debug5 << "CHILD OUTPUT[" << i << "]: " << outputs[i].c_str() << endl; debug5 << "CHILD OUTPUT[" << i << "]: " << outputs[i].c_str() << endl;
completeOutput += outputs[i]; 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"); completeOutput += std::string("\n");
} }
......
...@@ -19,7 +19,7 @@ LauncherState::SetupComponentRPCs(Xfer* xfer) ...@@ -19,7 +19,7 @@ LauncherState::SetupComponentRPCs(Xfer* xfer)
// //
// Connect the RPCs to the xfer object. // 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)); xfer->Add(GetStateObject(i));
} }
...@@ -32,7 +32,7 @@ LauncherState::GetNumStateObjects() ...@@ -32,7 +32,7 @@ LauncherState::GetNumStateObjects()
VisItRPC* VisItRPC*
LauncherState::GetStateObject(int i) LauncherState::GetStateObject(int i)
{ {
return (i >= 0 && i < objVector.size()) ? return (i >= 0 && (size_t)i < objVector.size()) ?
objVector[i] : 0; objVector[i] : 0;
} }
......
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