Skip to content
Permalink
Browse files

Fixed CMake 3.10 and gcc 7 warnings

  • Loading branch information...
Juan Hernando Vieites authored and eile committed Feb 5, 2019
1 parent f3cd5ab commit be4f29cd199df6aeab857642971910adbea4e473
Showing with 11 additions and 11 deletions.
  1. +3 −3 eq/config.cpp
  2. +0 −3 eq/fabric/wall.cpp
  3. +2 −3 eq/glx/eventHandler.cpp
  4. +2 −2 eq/glx/window.cpp
  5. +1 −0 eq/image.cpp
  6. +3 −0 eq/server/CMakeLists.txt
@@ -834,7 +834,7 @@ void Config::addStatistic(const Statistic& stat LB_UNUSED)
case Statistic::CHANNEL_FRAME_WAIT_SENDTOKEN:
type.subgroup = "transmit";
item.thread = THREAD_ASYNC2;
// no break;
// falls through
case Statistic::CHANNEL_FRAME_WAIT_READY:
type.group = "channel";
item.layer = 1;
@@ -870,7 +870,7 @@ void Config::addStatistic(const Statistic& stat LB_UNUSED)

case Statistic::CONFIG_WAIT_FINISH_FRAME:
item.layer = 1;
// no break;
// falls through
case Statistic::CONFIG_START_FRAME:
case Statistic::CONFIG_FINISH_FRAME:
type.group = "config";
@@ -900,7 +900,7 @@ void Config::addStatistic(const Statistic& stat LB_UNUSED)
}
_impl->statistics->setText(text.str());
}
// no break;
// falls through

case Statistic::WINDOW_FPS:
case Statistic::NONE:
@@ -257,9 +257,6 @@ std::ostream& operator<<(std::ostream& os, const Wall::Type& type)
os << "HMD";
break;

default:
LBASSERT(false);

case Wall::TYPE_FIXED:
os << "fixed";
break;
@@ -429,8 +429,7 @@ bool EventHandler::_processEvent(const XEvent& event)
if (static_cast<Atom>(event.xclient.data.l[0]) != deleteAtom)
return false; // not a delete message, ignore.
}
// else: delete message, fall through

// Falls through
case DestroyNotify:
return _window->processEvent(EVENT_WINDOW_CLOSE, event);

@@ -522,7 +521,7 @@ bool EventHandler::_processEvent(const XEvent& event)

default:
LBWARN << "Unhandled X event, type " << event.type << std::endl;
// no break;
// falls through
case ReparentNotify:
case VisibilityNotify:
return _window->processEvent(EVENT_UNKNOWN, event);
@@ -154,7 +154,7 @@ GLXFBConfig* Window::chooseGLXFBConfig()
default:
LBWARN << "Unknown drawable type " << drawableHint << ", using window"
<< std::endl;
// no break;
// falls through
case UNDEFINED:
case OFF: // needs fbConfig with visual for dummy window
case FBO: // No typo - FBO needs fbConfig with visual for dummy window
@@ -444,7 +444,7 @@ bool Window::configInitGLXDrawable(GLXFBConfig* fbConfig)
default:
LBWARN << "Unknown drawable type " << getIAttribute(IATTR_HINT_DRAWABLE)
<< ", using window" << std::endl;
// no break;
// falls through
case UNDEFINED:
case WINDOW:
return configInitGLXWindow(fbConfig);
@@ -1296,6 +1296,7 @@ bool Image::_writeImage(const std::string& filename, const Frame::Buffer buffer,
{
case EQ_COMPRESSOR_DATATYPE_RGB10_A2:
header.maxValue = 1023;
// falls through
case EQ_COMPRESSOR_DATATYPE_BGRA:
case EQ_COMPRESSOR_DATATYPE_BGRA_UINT_8_8_8_8_REV:
case EQ_COMPRESSOR_DATATYPE_RGBA:
@@ -132,6 +132,9 @@ set(EQUALIZERSERVER_SOURCES
window.cpp
)

set_property(SOURCE ${BISON_PARSER_OUTPUTS} ${FLEX_LEXER_OUTPUTS} PROPERTY
SKIP_AUTOGEN ON)

if(EQUALIZER_INSTALL_SERVER_HEADERS)
set(EQUALIZERSERVER_PUBLIC_HEADERS ${PUBLIC_HEADERS})
else()

0 comments on commit be4f29c

Please sign in to comment.
You can’t perform that action at this time.