Commit b5f7bb93 authored by bonnell's avatar bonnell
Browse files

For better namespace behavior, renames some visit-config defines with 'VISIT_'...

For better namespace behavior, renames some visit-config defines with 'VISIT_' prepended, namely: SLASH_CHAR, SLASH_STRING, SVN_REVISION, PLUGIN_EXTENSION, USE_PTY.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7178 18c085ea-50e0-402c-830e-de6fd14e8384
parent 40587061
......@@ -746,14 +746,14 @@ PF3DFileFormat::FilenameForDomain(int realDomain)
<< f.c_str() << endl;
// Find the directory prefix based on the path of the first master file.
std::string::size_type index = f.rfind(SLASH_STRING);
std::string::size_type index = f.rfind(VISIT_SLASH_STRING);
std::string vizDir("viz");
if(index != std::string::npos)
{
std::string path(f.substr(0, index));
debug4 << mName << "path = " << path << endl;
std::string::size_type index2 = path.rfind(SLASH_STRING);
std::string::size_type index2 = path.rfind(VISIT_SLASH_STRING);
if(index2 != std::string::npos)
{
vizDir = path.substr(index2+1);
......@@ -772,26 +772,26 @@ PF3DFileFormat::FilenameForDomain(int realDomain)
// Look for "/viz/" in the visnam string for the specified domain and use
// anything to the right of it.
std::string vizStr(SLASH_STRING);
std::string vizStr(VISIT_SLASH_STRING);
vizStr += "viz";
vizStr += SLASH_STRING;
vizStr += VISIT_SLASH_STRING;
f = std::string(master.Get_visname_for_domain(realDomain, 0));
index = f.rfind(vizStr);
if(index != std::string::npos)
middle = f.substr(index, f.size() - index);
if(middle.size() > 1)
{
if(middle[0] != SLASH_CHAR)
middle = std::string(SLASH_STRING) + middle;
if(middle[middle.size()-1] != SLASH_CHAR)
middle += SLASH_STRING;
if(middle[0] != VISIT_SLASH_CHAR)
middle = std::string(VISIT_SLASH_STRING) + middle;
if(middle[middle.size()-1] != VISIT_SLASH_CHAR)
middle += VISIT_SLASH_STRING;
// Replace "viz" with something else, if required.
std::string rhs(middle.substr(1,middle.size()-1));
std::string::size_type nextSlash = rhs.find(SLASH_STRING);
std::string::size_type nextSlash = rhs.find(VISIT_SLASH_STRING);
if(rhs.substr(nextSlash) != vizDir)
{
middle = std::string(SLASH_STRING) + vizDir +
middle = std::string(VISIT_SLASH_STRING) + vizDir +
rhs.substr(nextSlash, rhs.size() - nextSlash);
}
}
......@@ -2695,9 +2695,9 @@ PF3DFileFormat::MasterInformation::Get_dom_prefix_for_domain(int dom) const
if(retval.size() > 0)
{
if(retval[0] != '/')
retval = std::string(SLASH_STRING) + retval;
retval = std::string(VISIT_SLASH_STRING) + retval;
if(retval[retval.size()-1] != '/')
retval = retval + std::string(SLASH_STRING);
retval = retval + std::string(VISIT_SLASH_STRING);
}
}
......
......@@ -639,7 +639,7 @@ void vtkVisItPLOT3DReader::CollectInfo(char *x_file, char *s_file)
int lastSlash = -1;
for (int i = len-1; i >= 0; i--)
{
if (fap[i] == SLASH_CHAR)
if (fap[i] == VISIT_SLASH_CHAR)
{
lastSlash = i;
break;
......
......@@ -382,7 +382,7 @@ avtS3DFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md,
string timestepDir = CreateStringFromDouble(fileTimes[timeState]);
char path[256];
SNPRINTF(path,256,"%s%s%s%sfield.00000",dir.c_str(),SLASH_STRING, timestepDir.c_str(), SLASH_STRING);
SNPRINTF(path,256,"%s%s%s%sfield.00000",dir.c_str(),VISIT_SLASH_STRING, timestepDir.c_str(), VISIT_SLASH_STRING);
NcError err(NcError::verbose_nonfatal);
......@@ -726,7 +726,7 @@ avtS3DFileFormat::GetVar(int timeState, int domain, const char *varname)
// Open up the NetCDF file.
char path[256];
SNPRINTF(path,256,"%s%s%s%sfield.%05d",dir.c_str(),SLASH_STRING, timestepDir.c_str(), SLASH_STRING, domain);
SNPRINTF(path,256,"%s%s%s%sfield.%05d",dir.c_str(),VISIT_SLASH_STRING, timestepDir.c_str(), VISIT_SLASH_STRING, domain);
debug5 << "avtS3DFileFormat::GetVar: Full path to data file is " << path << endl;
NcFile nf(path);
......
......@@ -4543,7 +4543,7 @@ avtSAMRAIFileFormat::ReadDataset(hid_t &hdfFile, const char *dsPath,
//
// Modifications:
// Kathleen Bonnell, Mon Nov 3 17:53:33 PST 2008
// Use SLASH_CHAR instead of '/' so that this works on Windows.
// Use VISIT_SLASH_CHAR instead of '/' so that this works on Windows.
//
// ****************************************************************************
string
......@@ -4553,12 +4553,12 @@ GetDirName(const char *path)
int len = strlen(path);
const char *last = path + (len-1);
while (*last != SLASH_CHAR && last > path)
while (*last != VISIT_SLASH_CHAR && last > path)
{
last--;
}
if (*last != SLASH_CHAR)
if (*last != VISIT_SLASH_CHAR)
{
return "";
}
......
......@@ -721,7 +721,7 @@ avtSiloFileFormat::GetTimeVaryingInformation(DBfile *dbfile,
//
// Modifications:
// Brad Whitlock, Thu May 22 14:23:14 PST 2003
// I made it use SLASH_STRING so it works better on Windows.
// I made it use VISIT_SLASH_STRING so it works better on Windows.
//
// Mark C. Miller, Mon Feb 23 12:02:24 PST 2004
// Added bool to skip global info
......@@ -741,7 +741,7 @@ avtSiloFileFormat::OpenFile(const char *n, bool skipGlobalInfo)
while (thisSlash != NULL)
{
lastSlash = thisSlash;
thisSlash = strstr(lastSlash+1, SLASH_STRING);
thisSlash = strstr(lastSlash+1, VISIT_SLASH_STRING);
}
if (lastSlash == tocFile)
{
......
......@@ -558,7 +558,7 @@ avtVistaFileFormat::OpenFile(const char *fileName)
while (thisSlash != NULL)
{
lastSlash = thisSlash;
thisSlash = strstr(lastSlash+1, SLASH_STRING);
thisSlash = strstr(lastSlash+1, VISIT_SLASH_STRING);
}
if (lastSlash == tocFile)
{
......
......@@ -214,7 +214,7 @@ avtXDMFFileFormat::OpenFile(const char *n)
}
else
{
int lastSlash = fname.find_last_of(SLASH_STRING);
int lastSlash = fname.find_last_of(VISIT_SLASH_STRING);
if (lastSlash == string::npos)
{
strcpy(name, n);
......
......@@ -3997,7 +3997,7 @@ NetworkManager::ExportDatabase(int id, ExportDBAttributes *atts)
if (atts->GetDirname() == "")
qualFilename = atts->GetFilename();
else
qualFilename = atts->GetDirname() + std::string(SLASH_STRING)
qualFilename = atts->GetDirname() + std::string(VISIT_SLASH_STRING)
+ atts->GetFilename();
bool doAll = false;
std::vector<std::string> vars = atts->GetVariables();
......
......@@ -2992,7 +2992,7 @@ FileServerList::DecodePath(const string &path)
char
FileServerList::GetSeparator()
{
char sep = SLASH_CHAR;
char sep = VISIT_SLASH_CHAR;
SAFE_GET_SEPARATOR(activeHost, GetSeparator);
return sep;
}
......@@ -3000,7 +3000,7 @@ FileServerList::GetSeparator()
char
FileServerList::GetSeparator(const string &host)
{
char sep = SLASH_CHAR;
char sep = VISIT_SLASH_CHAR;
SAFE_GET_SEPARATOR(host, GetSeparator);
return sep;
}
......@@ -3024,7 +3024,7 @@ FileServerList::GetSeparator(const string &host)
string
FileServerList::GetSeparatorString()
{
string sep(SLASH_STRING);
string sep(VISIT_SLASH_STRING);
SAFE_GET_SEPARATOR(activeHost, GetSeparatorString);
return sep;
}
......@@ -3032,7 +3032,7 @@ FileServerList::GetSeparatorString()
string
FileServerList::GetSeparatorString(const string &host)
{
string sep(SLASH_STRING);
string sep(VISIT_SLASH_STRING);
SAFE_GET_SEPARATOR(host, GetSeparatorString);
return sep;
}
......
......@@ -318,10 +318,10 @@ MovieSequence::InitializeFromValues(const std::string &xmlFile, DataNode *node)
// Prepend the path to the XML file to the UI file if the
// UI file does not have a path.
if(!(uiFile.size() > 0 && uiFile[0] == SLASH_CHAR) &&
if(!(uiFile.size() > 0 && uiFile[0] == VISIT_SLASH_CHAR) &&
!(uiFile.size() > 2 && uiFile[1] == ':'))
{
std::string::size_type pos = xmlFile.rfind(SLASH_STRING);
std::string::size_type pos = xmlFile.rfind(VISIT_SLASH_STRING);
std::string prefix;
if(pos != std::string::npos)
prefix = xmlFile.substr(0, pos+1);
......
......@@ -312,7 +312,7 @@ GetMovieTemplateInformation(const std::string &filename, MovieTemplateInformatio
{
// Get the path to the filename so we can prepend it to all of
// the UI filenames.
std::string::size_type pos = filename.rfind(SLASH_STRING);
std::string::size_type pos = filename.rfind(VISIT_SLASH_STRING);
std::string prefix;
if(pos != std::string::npos)
prefix = filename.substr(0, pos+1);
......@@ -322,14 +322,14 @@ GetMovieTemplateInformation(const std::string &filename, MovieTemplateInformatio
info.specificationFile = filename;
cfg.GetTemplateFile(info.templateFile);
if(!(info.templateFile.size() > 0 && info.templateFile[0] == SLASH_CHAR) &&
if(!(info.templateFile.size() > 0 && info.templateFile[0] == VISIT_SLASH_CHAR) &&
!(info.templateFile.size() > 2 && info.templateFile[1] == ':'))
{
info.templateFile = prefix + info.templateFile;
}
cfg.GetPreviewImageFile(info.previewImageFile);
if(!(info.previewImageFile.size() > 0 && info.previewImageFile[0] == SLASH_CHAR) &&
if(!(info.previewImageFile.size() > 0 && info.previewImageFile[0] == VISIT_SLASH_CHAR) &&
!(info.previewImageFile.size() > 2 && info.previewImageFile[1] == ':'))
{
info.previewImageFile = prefix + info.previewImageFile;
......@@ -338,7 +338,7 @@ GetMovieTemplateInformation(const std::string &filename, MovieTemplateInformatio
info.usesSessionFile = cfg.GetSessionFile(info.sessionFile);
if(info.usesSessionFile)
{
if(!(info.sessionFile.size() > 0 && info.sessionFile[0] == SLASH_CHAR) &&
if(!(info.sessionFile.size() > 0 && info.sessionFile[0] == VISIT_SLASH_CHAR) &&
!(info.sessionFile.size() > 2 && info.sessionFile[1] == ':'))
{
info.sessionFile = prefix + info.sessionFile;
......
......@@ -61,7 +61,7 @@
QualifiedFilename::QualifiedFilename() : host(""), path(""), filename("")
{
separator = SLASH_CHAR;
separator = VISIT_SLASH_CHAR;
flag = 1;
}
......@@ -300,7 +300,7 @@ QualifiedFilename::Empty() const
char
QualifiedFilename::DetermineSeparator(const std::string &p) const
{
char sep = SLASH_CHAR;
char sep = VISIT_SLASH_CHAR;
for(int i = 0; i < p.length(); ++i)
{
......
......@@ -1340,7 +1340,7 @@ QvisGUIApplication::HandleSynchronize(int val)
sessionDir = GetUserVisItDirectory();
else
#ifndef WIN32
sessionDir = QString(QDir(".").absolutePath() + SLASH_STRING).toStdString();
sessionDir = QString(QDir(".").absolutePath() + VISIT_SLASH_STRING).toStdString();
#else
sessionDir = fileServer->GetPath();
#endif
......@@ -4470,7 +4470,7 @@ QvisGUIApplication::RestoreSessionFile(const QString &s,
// VisIt directory to it.
if(node == 0)
{
if(guifilename[0] != SLASH_CHAR)
if(guifilename[0] != VISIT_SLASH_CHAR)
{
filename = GetUserVisItDirectory() + filename;
guifilename = GetUserVisItDirectory() + guifilename;
......@@ -7363,7 +7363,7 @@ GetMovieCommandLine(const MovieAttributes *movieAtts, stringVector &args)
args.push_back("-output");
std::string dirFile(movieAtts->GetOutputDirectory());
if(dirFile == ".")
dirFile += SLASH_STRING;
dirFile += VISIT_SLASH_STRING;
dirFile += movieAtts->GetOutputName();
args.push_back(QuoteSpaces(dirFile));
......@@ -7420,7 +7420,7 @@ UpdateCurrentWindowSizes(MovieAttributes *movieAtts, int currentWidth,
{
if(useCurrentSize[i] == 1)
{
const int MAX_WINDOW_SIZE = OSMESA_SIZE_LIMIT;
const int MAX_WINDOW_SIZE = VISIT_RENDERING_SIZE_LIMIT;
int w = int(scales[i] * double(currentWidth));
widths[i] = (w > MAX_WINDOW_SIZE) ? MAX_WINDOW_SIZE : w;
int h = int(scales[i] * double(currentHeight));
......@@ -7499,7 +7499,7 @@ QvisGUIApplication::GetNumMovieFrames()
void
QvisGUIApplication::UpdateSessionDir( const std::string &sessionFileName )
{
int idx = sessionFileName.rfind(SLASH_STRING);
int idx = sessionFileName.rfind(VISIT_SLASH_STRING);
if ( idx != 0 )
sessionDir = sessionFileName.substr( 0, idx+1 );
}
......@@ -7705,7 +7705,7 @@ QvisGUIApplication::SaveMovieMain()
// Set the output directory.
QString outputDir(movieAtts->GetOutputDirectory().c_str());
if(outputDir.endsWith((char*)SLASH_STRING))
if(outputDir.endsWith((char*)VISIT_SLASH_STRING))
outputDir = outputDir.left(outputDir.length()-1);
outputDir = MakeCodeSlashes(outputDir);
code += " movie.outputDir = \"" + outputDir + "\"\n";
......@@ -7770,8 +7770,8 @@ QvisGUIApplication::SaveMovieMain()
{
// Create a name for the session file.
QString sessionName(movieAtts->GetOutputDirectory().c_str());
if(!sessionName.endsWith((char*)SLASH_STRING))
sessionName += SLASH_STRING;
if(!sessionName.endsWith((char*)VISIT_SLASH_STRING))
sessionName += VISIT_SLASH_STRING;
sessionName += QString(movieAtts->GetOutputName().c_str());
// Save the current session.
......
......@@ -904,15 +904,15 @@ QvisHelpWindow::TopicFromDocHelper(QString &str, const QString &doc,
QString
QvisHelpWindow::CompleteFileName(const QString &page) const
{
QString file(helpPath + QString(SLASH_STRING) +
locale + QString(SLASH_STRING) +
QString file(helpPath + QString(VISIT_SLASH_STRING) +
locale + QString(VISIT_SLASH_STRING) +
page);
if(!QFile(file).exists())
{
// The page did not exist for the desired locale, revert to the
// en_US page.
file = QString(helpPath + QString(SLASH_STRING) +
QString("en_US") + QString(SLASH_STRING) +
file = QString(helpPath + QString(VISIT_SLASH_STRING) +
QString("en_US") + QString(VISIT_SLASH_STRING) +
page);
}
......
......@@ -191,7 +191,7 @@ EnsureDirectoryExists(std::string &name, bool nameIsFile)
QString dirName;
if(nameIsFile)
{
std::string::size_type pos = name.rfind(SLASH_STRING);
std::string::size_type pos = name.rfind(VISIT_SLASH_STRING);
if(pos != std::string::npos)
{
dirName = QString(name.substr(0, pos).c_str());
......@@ -439,7 +439,7 @@ QvisSaveMovieWizard::WriteTemplateSpecification()
// determine the name of the specification file.
//
const std::string &tfile = it->second.info.specificationFile;
std::string::size_type slashpos = tfile.rfind(SLASH_STRING);
std::string::size_type slashpos = tfile.rfind(VISIT_SLASH_STRING);
if(slashpos != std::string::npos)
specificationFile = tfile.substr(slashpos+1, tfile.size()-slashpos-1);
else
......@@ -1400,7 +1400,7 @@ QvisSaveMovieWizard::CreateFormatPage()
page9_widthSpinBox = new QSpinBox(formatAndResolution);
page9_widthSpinBox->setMinimum(32);
page9_widthSpinBox->setMaximum(OSMESA_SIZE_LIMIT);
page9_widthSpinBox->setMaximum(VISIT_RENDERING_SIZE_LIMIT);
page9_widthSpinBox->setValue((int)(default_movie_size[0]));
page9_widthSpinBox->setEnabled(false);
connect(page9_widthSpinBox, SIGNAL(valueChanged(int)),
......@@ -1413,7 +1413,7 @@ QvisSaveMovieWizard::CreateFormatPage()
page9_heightSpinBox = new QSpinBox(formatAndResolution);
page9_heightSpinBox->setMinimum(32);
page9_heightSpinBox->setMaximum(OSMESA_SIZE_LIMIT);
page9_heightSpinBox->setMaximum(VISIT_RENDERING_SIZE_LIMIT);
page9_heightSpinBox->setValue((int)(default_movie_size[1]));
page9_heightSpinBox->setEnabled(false);
connect(page9_heightSpinBox, SIGNAL(valueChanged(int)),
......@@ -3508,8 +3508,8 @@ QvisSaveMovieWizard::GetMovieAttsOutputDir()
d.makeAbsolute();
std::string outDir(d.path().toStdString());
#endif
if(outDir.size() > 0 && outDir[outDir.size() - 1] != SLASH_CHAR)
outDir += SLASH_STRING;
if(outDir.size() > 0 && outDir[outDir.size() - 1] != VISIT_SLASH_CHAR)
outDir += VISIT_SLASH_STRING;
movieAtts->SetOutputDirectory(outDir);
}
return movieAtts->GetOutputDirectory();
......@@ -4516,8 +4516,8 @@ void
QvisSaveMovieWizard::page11_processOutputDirectoryText(const QString &s)
{
std::string outDir(s.toStdString());
if(outDir.size() > 0 && outDir[outDir.size() - 1] != SLASH_CHAR)
outDir += SLASH_STRING;
if(outDir.size() > 0 && outDir[outDir.size() - 1] != VISIT_SLASH_CHAR)
outDir += VISIT_SLASH_STRING;
movieAtts->SetOutputDirectory(outDir);
page11_UpdateButtons();
}
......@@ -4563,8 +4563,8 @@ QvisSaveMovieWizard::page11_selectOutputDirectory()
if(!dirName.isEmpty())
{
std::string outDir(dirName.toStdString());
if(outDir.size() > 0 && outDir[outDir.size() - 1] != SLASH_CHAR)
outDir += SLASH_STRING;
if(outDir.size() > 0 && outDir[outDir.size() - 1] != VISIT_SLASH_CHAR)
outDir += VISIT_SLASH_STRING;
movieAtts->SetOutputDirectory(outDir);
page11_outputDirectoryLineEdit->blockSignals(true);
......
......@@ -721,7 +721,7 @@ QvisSaveWindow::GetCurrentValues(int which_widget)
okay = (sscanf(temp.toStdString().c_str(), "%d", &w) == 1);
if(okay)
{
okay = (w <= OSMESA_SIZE_LIMIT);
okay = (w <= VISIT_RENDERING_SIZE_LIMIT);
if(okay)
{
......@@ -753,7 +753,7 @@ QvisSaveWindow::GetCurrentValues(int which_widget)
okay = (sscanf(temp.toStdString().c_str(), "%d", &h) == 1);
if(okay)
{
okay = (h <= OSMESA_SIZE_LIMIT);
okay = (h <= VISIT_RENDERING_SIZE_LIMIT);
if(okay)
{
......
......@@ -252,7 +252,7 @@ SplashScreen::SplashScreen(bool cyclePictures)
versionText.sprintf("VisIt %s, ", VERSION);
versionText += tr("svn revision");
versionText += " ";
versionText += SVN_REVISION;
versionText += VISIT_SVN_REVISION;
// Create a lookup of month names so the internationalization
// files don't have to change.
......
......@@ -133,7 +133,7 @@
#undef NO_SETBUF
/* OSMesa Window Size Limit. */
#undef OSMESA_SIZE_LIMIT
#undef VISIT_RENDERING_SIZE_LIMIT
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
......@@ -154,7 +154,7 @@
#undef PANTHERHACK
/* Shared library extension */
#undef PLUGIN_EXTENSION
#undef VISIT_PLUGIN_EXTENSION
/* Define PTY_SYSV if we have System V style pty functions -- BSD otherwise.
*/
......@@ -212,22 +212,22 @@
#undef SIZEOF_VOID_P
/* Define the slash character */
#undef SLASH_CHAR
#undef VISIT_SLASH_CHAR
/* Define the slash string */
#undef SLASH_STRING
#undef VISIT_SLASH_STRING
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Subversion revision */
#undef SVN_REVISION
#undef VISIT_SVN_REVISION
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Define USE_PTY if we want to use PTYs. */
#undef USE_PTY
/* Define VISIT_USE_PTY if we want to use PTYs. */
#undef VISIT_USE_PTY
/* Define to enable Tuvok-based code */
#undef USE_TUVOK
......
......@@ -1021,10 +1021,10 @@ MDServerConnection::FilteredPath(const std::string &path) const
if(state == 0)
{
filteredPath += path[i];
if(path[i] == SLASH_CHAR)
if(path[i] == VISIT_SLASH_CHAR)
state = 1;
}
else if(path[i] != SLASH_CHAR)
else if(path[i] != VISIT_SLASH_CHAR)
{
filteredPath += path[i];
state = 0;
......@@ -1032,13 +1032,13 @@ MDServerConnection::FilteredPath(const std::string &path) const
}
std::string path2(filteredPath);
if(path2.length() > 0 && path2[path2.length() - 1] == SLASH_CHAR)
if(path2.length() > 0 && path2[path2.length() - 1] == VISIT_SLASH_CHAR)
{
filteredPath = path2.substr(0, path2.length() - 1);
}
if(filteredPath.size() == 0)
filteredPath = SLASH_STRING;
filteredPath = VISIT_SLASH_STRING;
else
{
// Filter out .. so we get the right path.
......@@ -1048,7 +1048,7 @@ MDServerConnection::FilteredPath(const std::string &path) const
const char *str = filteredPath.c_str();
for(i = 0; i < filteredPath.length() + 1; ++i)
{
if(str[i] == SLASH_CHAR || str[i] == '\0')
if(str[i] == VISIT_SLASH_CHAR || str[i] == '\0')
{
if(tmp.size() > 0)
{
......@@ -1071,9 +1071,9 @@ MDServerConnection::FilteredPath(const std::string &path) const
{
#if defined(_WIN32)
if(i > 0)
filteredPath += SLASH_STRING;
filteredPath += VISIT_SLASH_STRING;
#else
filteredPath += SLASH_STRING;
filteredPath += VISIT_SLASH_STRING;
#endif
filteredPath += tmpNames[i];
}
......@@ -2269,8 +2269,8 @@ MDServerConnection::GetFilteredFileList(GetFileListRPC::FileList &files)
// Create a good path.
std::string path(currentWorkingDirectory);
if(path[path.size() - 1] != SLASH_CHAR)
path += SLASH_STRING;
if(path[path.size() - 1] != VISIT_SLASH_CHAR)
path += VISIT_SLASH_STRING;
// Add the file to the virtual files map. Give the data from the
// new vector of filenames to the existing vector of filenames
......@@ -2565,7 +2565,7 @@ MDServerConnection::GetVirtualFileDefinition(const std::string &file)
VirtualFileInformationMap::iterator virtualFile = virtualFiles.find(file);
bool fileContainsStar = (file.find("*") != std::string::npos);
std::string::size_type index = file.rfind(SLASH_STRING);
std::string::size_type index = file.rfind(VISIT_SLASH_STRING);
if (virtualFile == virtualFiles.end())
{
......
......@@ -102,7 +102,7 @@ MDServerProxy::MDServerProxy() : RemoteProxyBase("-mdserver"),
createGroupListRPC(), expandPathRPC(), closeDatabaseRPC(),
loadPluginsRPC(), getPluginErrorsRPC(), getDBPluginInfoRPC()
{
separator = SLASH_CHAR;
separator = VISIT_SLASH_CHAR;
}
// ****************************************************************************
......
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