* some cleanup of warnings

9 files changed, 20 insertions, 43 deletions

diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index c2b8eca9573..f59a0b06ddc 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -51,11 +51,6 @@
 #include "GHOST_IEventConsumer.h"
 #include "intern/GHOST_CallbackEventConsumer.h"
 
-#ifdef WIN32
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
-
-
 GHOST_SystemHandle GHOST_CreateSystem(void)
 {
 	GHOST_ISystem::createSystem();
diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h
index d7133f4401f..2737506a274 100644
--- a/intern/ghost/intern/GHOST_DisplayManager.h
+++ b/intern/ghost/intern/GHOST_DisplayManager.h
@@ -38,10 +38,6 @@
 
 #include "GHOST_Types.h"
 
-#ifdef WIN32
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-#endif // WIN32
-
 #include <vector>
 
 /**
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
index 3fbacfb1db8..f67a549703f 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
@@ -129,7 +129,7 @@ GHOST_TSuccess GHOST_DisplayManagerWin32::setCurrentDisplaySetting(GHOST_TUns8 d
 	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerWin32::setCurrentDisplaySetting(): only main display is supported");
 
 	GHOST_DisplaySetting match;
-	GHOST_TSuccess success = findMatch(display, setting, match);
+	findMatch(display, setting, match);
 	DEVMODE dm;
 	int i = 0;
 	while (::EnumDisplaySettings(NULL, i++, &dm)) {
diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h
index 068ded8ddee..40795c303c6 100644
--- a/intern/ghost/intern/GHOST_EventManager.h
+++ b/intern/ghost/intern/GHOST_EventManager.h
@@ -36,10 +36,6 @@
 #ifndef _GHOST_EVENT_MANAGER_H_
 #define _GHOST_EVENT_MANAGER_H_
 
-#ifdef WIN32
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-#endif // WIN32
-
 #include <deque>
 #include <vector>
 
diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp
index ad65d1fbb18..b5a9a251ecc 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.cpp
+++ b/intern/ghost/intern/GHOST_EventPrinter.cpp
@@ -51,36 +51,36 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event)
 
 	if (event->getType() == GHOST_kEventWindowUpdate) return false;
 
-	//std::cout << "GHOST_EventPrinter::processEvent, time: " << (GHOST_TInt32)event->getTime() << ", type: ";
+	std::cout << "GHOST_EventPrinter::processEvent, time: " << (GHOST_TInt32)event->getTime() << ", type: ";
 	switch (event->getType()) {
 	case GHOST_kEventUnknown:
-		//std::cout << "GHOST_kEventUnknown"; handled = false;	
+		std::cout << "GHOST_kEventUnknown"; handled = false;	
 		break;
 
 	case GHOST_kEventButtonUp:
 		{
 		GHOST_TEventButtonData* buttonData = (GHOST_TEventButtonData*)((GHOST_IEvent*)event)->getData();
-		//std::cout << "GHOST_kEventCursorButtonUp, button: " << buttonData->button;
+		std::cout << "GHOST_kEventCursorButtonUp, button: " << buttonData->button;
 		}
 		break;
 	case GHOST_kEventButtonDown:
 		{
 		GHOST_TEventButtonData* buttonData = (GHOST_TEventButtonData*)((GHOST_IEvent*)event)->getData();
-		//std::cout << "GHOST_kEventButtonDown, button: " << buttonData->button;
+		std::cout << "GHOST_kEventButtonDown, button: " << buttonData->button;
 		}
 		break;
 
 	case GHOST_kEventWheel:
 		{
 		GHOST_TEventWheelData* wheelData = (GHOST_TEventWheelData*)((GHOST_IEvent*)event)->getData();
-		//std::cout << "GHOST_kEventWheel, z: " << wheelData->z;
+		std::cout << "GHOST_kEventWheel, z: " << wheelData->z;
 		}
 		break;
 
 	case GHOST_kEventCursorMove:
 		{
 		GHOST_TEventCursorData* cursorData = (GHOST_TEventCursorData*)((GHOST_IEvent*)event)->getData();
-		//std::cout << "GHOST_kEventCursorMove, (x,y): (" << cursorData->x << "," << cursorData->y << ")";
+		std::cout << "GHOST_kEventCursorMove, (x,y): (" << cursorData->x << "," << cursorData->y << ")";
 		}
 		break;
 
@@ -89,7 +89,7 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event)
 		GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData();
 		STR_String str;
 		getKeyString(keyData->key, str);
-		//std::cout << "GHOST_kEventKeyUp, key: " << str.Ptr();
+		std::cout << "GHOST_kEventKeyUp, key: " << str.Ptr();
 		}
 		break;
 	case GHOST_kEventKeyDown:
@@ -97,34 +97,34 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event)
 		GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData();
 		STR_String str;
 		getKeyString(keyData->key, str);
-		//std::cout << "GHOST_kEventKeyDown, key: " << str.Ptr();
+		std::cout << "GHOST_kEventKeyDown, key: " << str.Ptr();
 		}
 		break;
 
 	case GHOST_kEventQuit:
-		//std::cout << "GHOST_kEventQuit"; 
+		std::cout << "GHOST_kEventQuit"; 
 		break;
 	case GHOST_kEventWindowClose:
-		//std::cout << "GHOST_kEventWindowClose"; 
+		std::cout << "GHOST_kEventWindowClose"; 
 		break;
 	case GHOST_kEventWindowActivate:
-		//std::cout << "GHOST_kEventWindowActivate"; 
+		std::cout << "GHOST_kEventWindowActivate"; 
 		break;
 	case GHOST_kEventWindowDeactivate:
-		//std::cout << "GHOST_kEventWindowDeactivate"; 
+		std::cout << "GHOST_kEventWindowDeactivate"; 
 		break;
 	case GHOST_kEventWindowUpdate:
-		//std::cout << "GHOST_kEventWindowUpdate"; 
+		std::cout << "GHOST_kEventWindowUpdate"; 
 		break;
 	case GHOST_kEventWindowSize:
-		//std::cout << "GHOST_kEventWindowSize"; 
+		std::cout << "GHOST_kEventWindowSize"; 
 		break;
 
 	default:
-		//std::cout << "not found"; handled = false; 
+		std::cout << "not found"; handled = false; 
 		break;
 	}
-	//std::cout << "\n";
+	std::cout << "\n";
 	return handled;
 }
 
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index ce1eaf32101..9ddcd09cbc1 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -41,8 +41,6 @@
 #include <config.h>
 #endif
 
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-
 #include "GHOST_SystemWin32.h"
 
 /*
diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h
index ff42f95fc0f..25b3525767e 100644
--- a/intern/ghost/intern/GHOST_TimerManager.h
+++ b/intern/ghost/intern/GHOST_TimerManager.h
@@ -36,10 +36,6 @@
 #ifndef _GHOST_TIMER_MANAGER_H_
 #define _GHOST_TIMER_MANAGER_H_
 
-#ifdef WIN32
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-#endif // WIN32
-
 #include <vector>
 
 #include "GHOST_Types.h"
diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h
index f2ad003d801..f754757e9d4 100644
--- a/intern/ghost/intern/GHOST_WindowManager.h
+++ b/intern/ghost/intern/GHOST_WindowManager.h
@@ -36,10 +36,6 @@
 #ifndef _GHOST_WINDOW_MANAGER_H_
 #define _GHOST_WINDOW_MANAGER_H_
 
-#ifdef WIN32
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-#endif // WIN32
-
 #include <vector>
 
 #include "GHOST_Rect.h"
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 101f332fc53..178c79e4aeb 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -314,7 +314,7 @@ GHOST_TSuccess GHOST_WindowWin32::setClientWidth(GHOST_TUns32 width)
 	GHOST_TSuccess success;
 	GHOST_Rect cBnds, wBnds;
 	getClientBounds(cBnds);
-	if (cBnds.getWidth() != width) {
+	if (cBnds.getWidth() != (GHOST_TInt32)width) {
 		getWindowBounds(wBnds);
 		int cx = wBnds.getWidth() + width - cBnds.getWidth();
 		int cy = wBnds.getHeight();
@@ -333,7 +333,7 @@ GHOST_TSuccess GHOST_WindowWin32::setClientHeight(GHOST_TUns32 height)
 	GHOST_TSuccess success;
 	GHOST_Rect cBnds, wBnds;
 	getClientBounds(cBnds);
-	if (cBnds.getHeight() != height) {
+	if (cBnds.getHeight() != (GHOST_TInt32)height) {
 		getWindowBounds(wBnds);
 		int cx = wBnds.getWidth();
 		int cy = wBnds.getHeight() + height - cBnds.getHeight();
@@ -352,7 +352,7 @@ GHOST_TSuccess GHOST_WindowWin32::setClientSize(GHOST_TUns32 width, GHOST_TUns32
 	GHOST_TSuccess success;
 	GHOST_Rect cBnds, wBnds;
 	getClientBounds(cBnds);
-	if ((cBnds.getWidth() != width) || (cBnds.getHeight() != height)) {
+	if ((cBnds.getWidth() != (GHOST_TInt32)width) || (cBnds.getHeight() != (GHOST_TInt32)height)) {
 		getWindowBounds(wBnds);
 		int cx = wBnds.getWidth() + width - cBnds.getWidth();
 		int cy = wBnds.getHeight() + height - cBnds.getHeight();