[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44850] trunk/blender: WITH_GHOST_SDL working again (missing std:: update)

[Campbell Barton]

Revision: 44850
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44850
Author:   campbellbarton
Date:     2012-03-13 14:28:58 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
WITH_GHOST_SDL working again (missing std:: update)

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt        2012-03-13 10:31:42 UTC (rev 44849)
+++ trunk/blender/CMakeLists.txt        2012-03-13 14:28:58 UTC (rev 44850)
@@ -358,6 +358,11 @@
        set(CMAKE_SKIP_BUILD_RPATH TRUE)
 endif()
 
+if(WITH_GHOST_SDL OR WITH_HEADLESS)
+    set(WITH_GHOST_XDND OFF)
+endif()
+
+
 #-----------------------------------------------------------------------------
 # Initialize un-cached vars, avoid unused warning
 

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp       2012-03-13 
10:31:42 UTC (rev 44849)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp       2012-03-13 
14:28:58 UTC (rev 44850)
@@ -481,8 +481,8 @@
 bool
 GHOST_SystemSDL::generateWindowExposeEvents()
 {
-       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 *>::iterator w_start= 
m_dirty_windows.begin();
+       std::vector<GHOST_WindowSDL *>::const_iterator w_end= 
m_dirty_windows.end();
        bool anyProcessed= false;
 
        for (;w_start != w_end; ++w_start) {
@@ -563,10 +563,10 @@
        // We should always check the window manager's list of 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();
-       vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end();
+       std::vector<GHOST_IWindow *>::iterator win_it= win_vec.begin();
+       std::vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end();
 
        for (; win_it != win_end; ++win_it) {
                GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL 
*>(*win_it);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs