From 47bf88ed3f2321fc581d2d8e5d925b343f0931e7 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 12 Jul 2014 16:00:10 +0200 Subject: [PATCH] gsdx: miss break / inline function in header --- plugins/GSdx/GSState.cpp | 6 ++++++ plugins/GSdx/stdafx.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp index d36fe42d8a..604836af03 100644 --- a/plugins/GSdx/GSState.cpp +++ b/plugins/GSdx/GSState.cpp @@ -2425,6 +2425,8 @@ __forceinline void GSState::VertexKick(uint32 skip) pmin = v2.min_i16(v1.min_i16(v3)); pmax = v2.max_i16(v1.max_i16(v3)); break; + default: + break; } GSVector4i test = pmax.lt16(m_scissor) | pmin.gt16(m_scissor.zwzwl()); @@ -2437,6 +2439,8 @@ __forceinline void GSState::VertexKick(uint32 skip) case GS_SPRITE: test |= m_nativeres ? pmin.eq16(pmax).zwzwl() : pmin.eq16(pmax); break; + default: + break; } switch(prim) @@ -2460,6 +2464,8 @@ __forceinline void GSState::VertexKick(uint32 skip) */ test = (test | v3 == v1) | (v1 == v2 | v3 == v2); break; + default: + break; } skip |= test.mask() & 15; diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h index f0f035a433..136802b139 100644 --- a/plugins/GSdx/stdafx.h +++ b/plugins/GSdx/stdafx.h @@ -361,7 +361,7 @@ struct aligned_free_second {template void operator()(T& p) {_aligned_fr #if defined(__USE_ISOC11) #define _aligned_malloc(size, a) aligned_alloc(a, size) - static void _aligned_free(void* p) { free(p); } + static inline void _aligned_free(void* p) { free(p); } #elif !defined(HAVE_ALIGNED_MALLOC)