Commit fbb48de0 authored by fogal1's avatar fogal1

Rename namespace to avoid a conflict with X names.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@14767 18c085ea-50e0-402c-830e-de6fd14e8384
parent cc2785d7
......@@ -3804,6 +3804,9 @@ Engine::GetProcessAttributes()
// Set the callback HW/SW rendering, since code outside of the Engine will
// use that to query what kind of rendering to do.
//
// Tom Fogal, Tue May 25 16:09:31 MDT 2010
// Namespace was renamed to avoid X conflict
//
// ****************************************************************************
void
......@@ -3832,21 +3835,21 @@ Engine::SetupDisplay()
static_cast<size_t>(rank-min) < this->nDisplays)
{
display = rank-min;
this->renderingDisplay = Display::Create(Display::D_X);
this->renderingDisplay = VDisplay::Create(VDisplay::D_X);
}
}
}
#else
if(this->nDisplays > 0)
{
this->renderingDisplay = Display::Create(Display::D_X);
this->renderingDisplay = VDisplay::Create(VDisplay::D_X);
avtCallback::SetSoftwareRendering(false);
display = 0;
}
#endif
if(this->renderingDisplay == NULL)
{
this->renderingDisplay = Display::Create(Display::D_MESA);
this->renderingDisplay = VDisplay::Create(VDisplay::D_MESA);
avtCallback::SetSoftwareRendering(true);
}
if(this->renderingDisplay->Initialize(display,
......
......@@ -137,9 +137,12 @@ split(std::string str, size_t node, size_t display)
// Tom Fogal, Sat May 30 12:32:51 MDT 2009
// Add debug messages so we can figure out which display was created.
//
// Tom Fogal, Tue May 25 16:09:02 MDT 2010
// Rename namespace to avoid X conflict.
//
// ****************************************************************************
VisItDisplay *
Display::Create(enum visitDisplayType vtype)
VDisplay::Create(enum visitDisplayType vtype)
{
switch(vtype)
{
......
......@@ -93,7 +93,7 @@ class ENGINE_MAIN_API VisItDisplay
std::string format(std::string s, size_t node, size_t display);
std::vector<std::string> split(std::string, size_t, size_t);
namespace Display {
namespace VDisplay {
enum visitDisplayType {
D_MESA, // mesa based SW rendering
D_X // starts an X server to use HW rendering
......
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