Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code Cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton
2013-11-22 11:30:40 +11:00
parent a5183d7a87
commit d4a11388bf
7 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -2058,6 +2058,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros) ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations) ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function) ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast) ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes) ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)

5
source/blender/bmesh/tools/bmesh_beautify.c
View File

@@ -309,8 +309,6 @@ static void bm_edge_update_beauty_cost_single(BMEdge *e, Heap *eheap, HeapNode *
/* check if we can add it back */ /* check if we can add it back */
BLI_assert(BM_edge_is_manifold(e) == true); BLI_assert(BM_edge_is_manifold(e) == true);
//BLI_assert(BMO_elem_flag_test(bm, e->l->f, FACE_MARK) &&
// BMO_elem_flag_test(bm, e->l->radial_next->f, FACE_MARK));
/* check we're not moving back into a state we have been in before */ /* check we're not moving back into a state we have been in before */
if (e_state_set != NULL) { if (e_state_set != NULL) {
@@ -354,9 +352,6 @@ static void bm_edge_update_beauty_cost(BMEdge *e, Heap *eheap, HeapNode **eheap_
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Beautify Fill */ /* Beautify Fill */
#define ELE_NEW 1
#define FACE_MARK 2
/** /**
* \note All edges in \a edge_array must be tagged and * \note All edges in \a edge_array must be tagged and
* have their index values set according to their position in the array. * have their index values set according to their position in the array.

8
source/blender/compositor/intern/COM_SocketReader.h
View File

@@ -102,11 +102,11 @@ public:
} }
virtual void *initializeTileData(rcti *rect) { return 0; } virtual void *initializeTileData(rcti *rect) { return 0; }
virtual void deinitializeTileData(rcti *rect, void *data) { virtual void deinitializeTileData(rcti *rect, void *data) {}
}
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
virtual ~SocketReader() {}
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
inline const unsigned int getWidth() const { return this->m_width; } inline const unsigned int getWidth() const { return this->m_width; }
inline const unsigned int getHeight() const { return this->m_height; } inline const unsigned int getHeight() const { return this->m_height; }

6
source/blender/compositor/intern/COM_WorkScheduler.cpp
View File

@@ -77,9 +77,9 @@ static bool g_openclInitialized = false;
#define MAX_HIGHLIGHT 8 #define MAX_HIGHLIGHT 8
static bool g_highlightInitialized = false; static bool g_highlightInitialized = false;
extern "C" { extern "C" {
int g_highlightIndex; static int g_highlightIndex;
void **g_highlightedNodes; static void **g_highlightedNodes;
void **g_highlightedNodesRead; static void **g_highlightedNodesRead;
#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
#define HIGHLIGHT(wp) \ #define HIGHLIGHT(wp) \

2
source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
View File

@@ -29,7 +29,7 @@ extern "C" {
} }
vector<DistortionCache *> s_cache; static vector<DistortionCache *> s_cache;
void deintializeDistortionCache(void) void deintializeDistortionCache(void)
{ {

2
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@@ -1229,7 +1229,7 @@ void RAS_OpenGLRasterizer::RemoveLight(struct RAS_LightObject* lightobject)
m_lights.erase(lit); m_lights.erase(lit);
} }
bool RAS_OpenGLRasterizer::RayHit(class KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) bool RAS_OpenGLRasterizer::RayHit(struct KX_ClientObjectInfo *client, KX_RayCast *result, void * const data)
{ {
double* const oglmatrix = (double* const) data; double* const oglmatrix = (double* const) data;

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
View File

@@ -380,8 +380,8 @@ public:
void PushMatrix(); void PushMatrix();
void PopMatrix(); void PopMatrix();
bool RayHit(class KX_ClientObjectInfo* client, class KX_RayCast* result, void * const data); bool RayHit(struct KX_ClientObjectInfo* client, class KX_RayCast* result, void * const data);
bool NeedRayCast(class KX_ClientObjectInfo*) { return true; } bool NeedRayCast(struct KX_ClientObjectInfo*) { return true; }
void AddLight(struct RAS_LightObject* lightobject); void AddLight(struct RAS_LightObject* lightobject);