diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-16 17:32:26 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-16 17:33:00 +0300 |
| commit | d0246d5f301c0af8af9ccfbfe135cfbe034deca9 (patch) | |
| tree | ab9beb7549f228b3f749326b860dd721441df17b /intern/cycles/util | |
| parent | 21c88df7c73dc35134de061a89b088985bbccadb (diff) | |
Cycles: Some cleanup, should be no functional changes
Addressing meaningful feedback from coverity.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_aligned_malloc.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/util/util_path.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/util_aligned_malloc.cpp index b161a55c15e..15d2eb3271b 100644 --- a/intern/cycles/util/util_aligned_malloc.cpp +++ b/intern/cycles/util/util_aligned_malloc.cpp @@ -44,8 +44,7 @@ void *util_aligned_malloc(size_t size, int alignment) { #ifdef WITH_BLENDER_GUARDEDALLOC return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc"); -#endif -#ifdef _WIN32 +#elif defined(_WIN32) return _aligned_malloc(size, alignment); #elif defined(__APPLE__) /* On Mac OS X, both the heap and the stack are guaranteed 16-byte aligned so diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index db3891e9ea0..389bb4608c5 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -178,7 +178,8 @@ public: class path_info { public: path_info(const string& path) - : path_(path) + : path_(path), + entry_(NULL) { } |