Commit 12ca57d0 authored by miller86's avatar miller86

fixed minor performance issue with Merge method

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7354 18c085ea-50e0-402c-830e-de6fd14e8384
parent bc31a5f9
......@@ -964,6 +964,9 @@ FileOpenOptions::FieldsEqual(int index_, const AttributeGroup *rhs) const
// dbinfo function argument while the options read from the config file
// are basically part of 'this' object. Adjusted logic to deal with
// options that have been made obsolete.
//
// Mark C. Miller, Tue May 19 20:53:25 PDT 2009
// Terminate for loop searching for matching typeID early.
// ****************************************************************************
void
......@@ -976,7 +979,7 @@ FileOpenOptions::MergeNewFromPluginInfo(const DBPluginInfoAttributes *dbinfo)
const std::string &id = dbinfo->GetTypesFullNames()[i];
const std::string &name = dbinfo->GetTypes()[i];
int index = -1;
for (size_t j=0; j<typeIDs.size(); j++)
for (size_t j=0; index==-1 && j<typeIDs.size(); j++)
{
if (typeIDs[j] == id)
index = j;
......
......@@ -20,6 +20,9 @@ Definition:
// dbinfo function argument while the options read from the config file
// are basically part of 'this' object. Adjusted logic to deal with
// options that have been made obsolete.
//
// Mark C. Miller, Tue May 19 20:53:25 PDT 2009
// Terminate for loop searching for matching typeID early.
// ****************************************************************************
void
......@@ -32,7 +35,7 @@ FileOpenOptions::MergeNewFromPluginInfo(const DBPluginInfoAttributes *dbinfo)
const std::string &id = dbinfo->GetTypesFullNames()[i];
const std::string &name = dbinfo->GetTypes()[i];
int index = -1;
for (size_t j=0; j<typeIDs.size(); j++)
for (size_t j=0; index==-1 && j<typeIDs.size(); j++)
{
if (typeIDs[j] == id)
index = j;
......
......@@ -51,7 +51,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Tue Mar 17 18:00:58 PST 2009
// Creation: Tue May 19 20:54:37 PST 2009
//
// ****************************************************************************
......
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