[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51325] trunk/blender: code cleanup: check for msvc directly when using warning pragma's.
Campbell Barton
ideasman42 at gmail.com
Mon Oct 15 04:15:11 CEST 2012
Revision: 51325
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51325
Author: campbellbarton
Date: 2012-10-15 02:15:07 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
code cleanup: check for msvc directly when using warning pragma's.
Modified Paths:
--------------
trunk/blender/intern/ghost/GHOST_Types.h
trunk/blender/intern/ghost/intern/GHOST_Debug.h
trunk/blender/intern/ghost/test/multitest/MultiTest.c
trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/rand.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.h
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp
trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/Expressions/VectorValue.cpp
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_PyMath.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TimeLogger.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_Deformer.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.cpp
Modified: trunk/blender/intern/ghost/GHOST_Types.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Types.h 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/intern/ghost/GHOST_Types.h 2012-10-15 02:15:07 UTC (rev 51325)
@@ -50,7 +50,7 @@
typedef int GHOST_TInt32;
typedef unsigned int GHOST_TUns32;
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#ifdef _MSC_VER
typedef __int64 GHOST_TInt64;
typedef unsigned __int64 GHOST_TUns64;
#else
Modified: trunk/blender/intern/ghost/intern/GHOST_Debug.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Debug.h 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/intern/ghost/intern/GHOST_Debug.h 2012-10-15 02:15:07 UTC (rev 51325)
@@ -33,12 +33,12 @@
#ifndef __GHOST_DEBUG_H__
#define __GHOST_DEBUG_H__
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#ifdef _MSC_VER
# ifdef DEBUG
# pragma warning (disable:4786) // suppress stl-MSVC debug info warning
// #define GHOST_DEBUG
# endif // DEBUG
-#endif // WIN32
+#endif // _MSC_VER
#ifdef WITH_GHOST_DEBUG
# define GHOST_DEBUG // spit ghost events to stdout
Modified: trunk/blender/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-10-15 02:15:07 UTC (rev 51325)
@@ -26,9 +26,8 @@
*/
#define FALSE 0
-#ifdef WIN32
-
-#pragma warning(disable: 4244 4305)
+#ifdef _MSC_VER
+# pragma warning(disable: 4244 4305)
#endif
#include <stdlib.h>
Modified: trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
===================================================================
--- trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2012-10-15 02:15:07 UTC (rev 51325)
@@ -15,7 +15,6 @@
*
*/
-
#include <windows.h>
#include <winbase.h>
#include <stdio.h>
@@ -83,16 +82,16 @@
} VF_ReadData_Audio,*LPVF_ReadData_Audio;
typedef struct {
- DWORD dwSize;
- HRESULT (__stdcall *OpenFile)(
- char *lpFileName, LPVF_FileHandle lpFileHandle );
+ DWORD dwSize;
+ HRESULT (__stdcall *OpenFile)(
+ char *lpFileName, LPVF_FileHandle lpFileHandle );
HRESULT (__stdcall *CloseFile)( VF_FileHandle hFileHandle );
HRESULT (__stdcall *GetFileInfo)( VF_FileHandle hFileHandle,
- LPVF_FileInfo lpFileInfo );
+ LPVF_FileInfo lpFileInfo );
HRESULT (__stdcall *GetStreamInfo)( VF_FileHandle hFileHandle,
- DWORD dwStream,void *lpStreamInfo );
+ DWORD dwStream,void *lpStreamInfo );
HRESULT (__stdcall *ReadData)( VF_FileHandle hFileHandle,
- DWORD dwStream,void *lpData );
+ DWORD dwStream,void *lpData );
} VF_PluginFunc,*LPVF_PluginFunc;
__declspec(dllexport) HRESULT vfGetPluginInfo(
@@ -117,8 +116,9 @@
struct hostent *host;
unsigned long ip;
- if (((ip = inet_addr(ipaddr)) == INADDR_NONE)
- && strcmp(ipaddr, "255.255.255.255") != 0) {
+ if (((ip = inet_addr(ipaddr)) == INADDR_NONE) &&
+ strcmp(ipaddr, "255.255.255.255") != 0)
+ {
if ((host = gethostbyname(ipaddr)) != NULL) {
memcpy(&ip, host->h_addr, sizeof(ip));
}
@@ -419,6 +419,3 @@
return VF_OK;
}
-
-
-
Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-10-15 02:15:07 UTC (rev 51325)
@@ -33,8 +33,8 @@
*/
-#ifdef WIN32
-#pragma warning (disable:4244)
+#ifdef _MSC_VER
+# pragma warning (disable:4244)
#endif
#include <ft2build.h>
Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/blender/blenlib/intern/noise.c 2012-10-15 02:15:07 UTC (rev 51325)
@@ -31,9 +31,9 @@
*/
-#ifdef _WIN32
-#pragma warning (disable : 4244) // "conversion from double to float"
-#pragma warning (disable : 4305) // "truncation from const double to float"
+#ifdef _MSC_VER
+# pragma warning (disable:4244) /* "conversion from double to float" */
+# pragma warning (disable:4305) /* "truncation from const double to float" */
#endif
#include <math.h>
Modified: trunk/blender/source/blender/blenlib/intern/rand.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rand.c 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/blender/blenlib/intern/rand.c 2012-10-15 02:15:07 UTC (rev 51325)
@@ -40,7 +40,7 @@
#include "BLI_threads.h"
#include "BLI_rand.h"
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#ifdef _MSC_VER
typedef unsigned __int64 r_uint64;
#define MULTIPLIER 0x5DEECE66Di64
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-10-15 02:15:07 UTC (rev 51325)
@@ -777,13 +777,16 @@
char scene_name[MAX_ID_NAME - 2];
} RenderInfo;
-static void write_renderinfo(WriteData *wd, Main *mainvar) /* for renderdeamon */
+/* was for historic render-deamon feature,
+ * now write because it can be easily extracted without
+ * reading the whole blend file */
+static void write_renderinfo(WriteData *wd, Main *mainvar)
{
bScreen *curscreen;
Scene *sce;
RenderInfo data;
- /* XXX in future, handle multiple windows with multiple screnes? */
+ /* XXX in future, handle multiple windows with multiple screens? */
current_screen_compat(mainvar, &curscreen);
for (sce= mainvar->scene.first; sce; sce= sce->id.next) {
Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2012-10-15 02:15:07 UTC (rev 51325)
@@ -35,9 +35,9 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// don't show stl-warnings
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+ /* don't show stl-warnings */
+# pragma warning (disable:4786)
#endif
#include "GL/glew.h"
@@ -69,37 +69,33 @@
#include "Value.h"
-
-#ifdef __cplusplus
extern "C" {
-#endif
- /***/
-#include "DNA_view3d_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_windowmanager_types.h"
-#include "BKE_global.h"
-#include "BKE_report.h"
+ #include "DNA_view3d_types.h"
+ #include "DNA_screen_types.h"
+ #include "DNA_userdef_types.h"
+ #include "DNA_scene_types.h"
+ #include "DNA_windowmanager_types.h"
-#include "MEM_guardedalloc.h"
+ #include "BKE_global.h"
+ #include "BKE_report.h"
+ #include "BKE_ipo.h"
+ #include "BKE_main.h"
+ #include "BKE_context.h"
-/* #include "BKE_screen.h" */ /* cant include this because of 'new' function name */
-extern float BKE_screen_view3d_zoom_to_fac(float camzoom);
+ /* avoid c++ conflict with 'new' */
+ #define new _new
+ #include "BKE_screen.h"
+ #undef new
-#include "BKE_main.h"
-#include "BLI_blenlib.h"
-#include "BLO_readfile.h"
-#include "DNA_scene_types.h"
-#include "BKE_ipo.h"
- /***/
+ #include "MEM_guardedalloc.h"
-#include "BKE_context.h"
-#include "../../blender/windowmanager/WM_types.h"
-#include "../../blender/windowmanager/wm_window.h"
-#include "../../blender/windowmanager/wm_event_system.h"
-#ifdef __cplusplus
+ #include "BLI_blenlib.h"
+ #include "BLO_readfile.h"
+
+ #include "../../blender/windowmanager/WM_types.h"
+ #include "../../blender/windowmanager/wm_window.h"
+ #include "../../blender/windowmanager/wm_event_system.h"
}
-#endif
#ifdef WITH_AUDASPACE
# include "AUD_C-API.h"
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2012-10-15 02:15:07 UTC (rev 51325)
@@ -32,8 +32,8 @@
#ifndef __KX_BLENDERINPUTDEVICE_H__
#define __KX_BLENDERINPUTDEVICE_H__
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning(disable : 4786) // shut off 255 char limit debug template warning
+#ifdef _MSC_VER
+# pragma warning(disable:4786) // shut off 255 char limit debug template warning
#endif
#include <map>
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp 2012-10-15 02:15:07 UTC (rev 51325)
@@ -30,9 +30,9 @@
*/
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// annoying warnings about truncated STL debug info
-#pragma warning (disable :4786)
+#ifdef _MSC_VER
+ /* annoying warnings about truncated STL debug info */
+# pragma warning (disable:4786)
#endif
#include "KX_BlenderKeyboardDevice.h"
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp 2012-10-15 02:01:39 UTC (rev 51324)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp 2012-10-15 02:15:07 UTC (rev 51325)
@@ -29,10 +29,9 @@
* \ingroup blroutines
*/
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// annoying warnings about truncated STL debug info
-#pragma warning (disable :4786)
+#ifdef _MSC_VER
+ /* annoying warnings about truncated STL debug info */
+# pragma warning (disable:4786)
#endif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list