Skip to content
Snippets Groups Projects
Commit 59303e35 authored by Campbell Barton's avatar Campbell Barton
Browse files

WITH_GHOST_SDL working again (missing std:: update)

parent f34c3580
No related branches found
No related tags found
No related merge requests found
...@@ -358,6 +358,11 @@ if(WITH_INSTALL_PORTABLE) ...@@ -358,6 +358,11 @@ if(WITH_INSTALL_PORTABLE)
set(CMAKE_SKIP_BUILD_RPATH TRUE) set(CMAKE_SKIP_BUILD_RPATH TRUE)
endif() endif()
if(WITH_GHOST_SDL OR WITH_HEADLESS)
set(WITH_GHOST_XDND OFF)
endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Initialize un-cached vars, avoid unused warning # Initialize un-cached vars, avoid unused warning
......
...@@ -481,8 +481,8 @@ GHOST_SystemSDL::setCursorPosition(GHOST_TInt32 x, ...@@ -481,8 +481,8 @@ GHOST_SystemSDL::setCursorPosition(GHOST_TInt32 x,
bool bool
GHOST_SystemSDL::generateWindowExposeEvents() GHOST_SystemSDL::generateWindowExposeEvents()
{ {
vector<GHOST_WindowSDL *>::iterator w_start= m_dirty_windows.begin(); std::vector<GHOST_WindowSDL *>::iterator w_start= m_dirty_windows.begin();
vector<GHOST_WindowSDL *>::const_iterator w_end= m_dirty_windows.end(); std::vector<GHOST_WindowSDL *>::const_iterator w_end= m_dirty_windows.end();
bool anyProcessed= false; bool anyProcessed= false;
for (;w_start != w_end; ++w_start) { for (;w_start != w_end; ++w_start) {
...@@ -563,10 +563,10 @@ GHOST_SystemSDL::findGhostWindow(SDL_Window *sdl_win) ...@@ -563,10 +563,10 @@ GHOST_SystemSDL::findGhostWindow(SDL_Window *sdl_win)
// We should always check the window manager's list of windows // We should always check the window manager's list of windows
// and only process events on these windows. // and only process events on these windows.
vector<GHOST_IWindow *> & win_vec= m_windowManager->getWindows(); std::vector<GHOST_IWindow *> & win_vec= m_windowManager->getWindows();
vector<GHOST_IWindow *>::iterator win_it= win_vec.begin(); std::vector<GHOST_IWindow *>::iterator win_it= win_vec.begin();
vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end(); std::vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end();
for (; win_it != win_end; ++win_it) { for (; win_it != win_end; ++win_it) {
GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL *>(*win_it); GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL *>(*win_it);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment