Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-23 06:36:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-23 06:36:30 +0400
commit190f5d17871a714bb864e271985ea6e4c5d6b3d0 (patch)
treeee2678fac93bf9e0d1e8696da65564650adf3551 /intern/ghost
parentc8b53d2aaf7ee4d07736cf842ca385e0311f3c53 (diff)
code cleanup: dont set the namespace in STR_String.h - 'using namespace std', since this is included in many places.
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_WindowManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp
index a4b65c78ef9..cf236283b0f 100644
--- a/intern/ghost/intern/GHOST_WindowManager.cpp
+++ b/intern/ghost/intern/GHOST_WindowManager.cpp
@@ -79,7 +79,7 @@ GHOST_TSuccess GHOST_WindowManager::removeWindow(const GHOST_IWindow* window)
endFullScreen();
}
else {
- vector<GHOST_IWindow*>::iterator result = find(m_windows.begin(), m_windows.end(), window);
+ std::vector<GHOST_IWindow*>::iterator result = find(m_windows.begin(), m_windows.end(), window);
if (result != m_windows.end()) {
setWindowInactive(window);
m_windows.erase(result);
@@ -99,7 +99,7 @@ bool GHOST_WindowManager::getWindowFound(const GHOST_IWindow* window) const
found = true;
}
else {
- vector<GHOST_IWindow*>::const_iterator result = find(m_windows.begin(), m_windows.end(), window);
+ std::vector<GHOST_IWindow*>::const_iterator result = find(m_windows.begin(), m_windows.end(), window);
if (result != m_windows.end()) {
found = true;
}