griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Patch [#33196] Warning Fixes 11-16-2012

Browse Source 
* MEM_CacheLimitier - Size type to int conversion, should be safe for now (doing my best Bill Gates 640k impression)
* OpenNL CMakeLists.txt - MSVC and GCC have slightly different ways to remove definitions (DEBUG) without the compiler complaining
* BLI_math inlines - The include guard name and inline option macro name should be different. Suppressed warning about not exporting any symbols from inline math library
* BLI string / utf8 - Fixed some inconsistencies between declarations and definitions
* nodes - node_composite_util is apparently not used unless you enable the legacy compositor, so it should not be compiled in that case.

Leaving out changes to BLI_fileops for now, need to do more testing.
This commit is contained in:
Jason Wilkins
2012-11-23 15:12:13 +00:00
parent c407c951a0
commit 69b88cf719
14 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/memutil/MEM_CacheLimiter.h
View File

@@ -247,8 +247,10 @@ private:
if (!elem->can_destroy())
continue;
/* by default 0 means higherst priority element */
int priority = -(queue.size() - i - 1);
/* by default 0 means highest priority element */
/* casting a size type to int is questionable,
but unlikely to cause problems */
int priority = -((int)(queue.size()) - i - 1);
priority = getItemPriority(elem->get()->get_data(), priority);
if (priority < best_match_priority || best_match_elem == NULL) {