[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13082] branches/blender2.5/blender/intern /ghost/intern: * some cleanup of warnings
Nathan Letwory
jesterking at letwory.net
Tue Jan 1 11:45:48 CET 2008
Revision: 13082
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13082
Author: jesterking
Date: 2008-01-01 11:45:48 +0100 (Tue, 01 Jan 2008)
Log Message:
-----------
* some cleanup of warnings
Modified Paths:
--------------
branches/blender2.5/blender/intern/ghost/intern/GHOST_C-api.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManager.h
branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_EventManager.h
branches/blender2.5/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_TimerManager.h
branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowManager.h
branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_C-api.cpp 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_C-api.cpp 2008-01-01 10:45:48 UTC (rev 13082)
@@ -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();
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManager.h
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManager.h 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManager.h 2008-01-01 10:45:48 UTC (rev 13082)
@@ -38,10 +38,6 @@
#include "GHOST_Types.h"
-#ifdef WIN32
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-#endif // WIN32
-
#include <vector>
/**
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp 2008-01-01 10:45:48 UTC (rev 13082)
@@ -129,7 +129,7 @@
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)) {
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_EventManager.h
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_EventManager.h 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_EventManager.h 2008-01-01 10:45:48 UTC (rev 13082)
@@ -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>
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_EventPrinter.cpp 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_EventPrinter.cpp 2008-01-01 10:45:48 UTC (rev 13082)
@@ -51,36 +51,36 @@
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 @@
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 @@
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;
}
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-01-01 10:45:48 UTC (rev 13082)
@@ -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"
/*
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_TimerManager.h
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_TimerManager.h 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_TimerManager.h 2008-01-01 10:45:48 UTC (rev 13082)
@@ -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"
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowManager.h
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowManager.h 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowManager.h 2008-01-01 10:45:48 UTC (rev 13082)
@@ -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"
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-01-01 09:28:29 UTC (rev 13081)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-01-01 10:45:48 UTC (rev 13082)
@@ -314,7 +314,7 @@
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 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 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();
More information about the Bf-blender-cvs
mailing list