From 25c96bc9f348814d50095710c30ddc2776f5bb12 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 20 Sep 2012 01:02:39 +0000
Subject: code cleanup: remove unused macros, commet some which may be useful
 later - or good to keep for completeness. quieted some warnings and add flags
 -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc

---
 intern/audaspace/FX/AUD_IIRFilterReader.cpp | 2 +-
 intern/cycles/util/util_math.h              | 4 +++-
 intern/mikktspace/mikktspace.c              | 3 +++
 intern/raskter/raskter.c                    | 1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'intern')

diff --git a/intern/audaspace/FX/AUD_IIRFilterReader.cpp b/intern/audaspace/FX/AUD_IIRFilterReader.cpp
index 06880818692..8f78c110d1f 100644
--- a/intern/audaspace/FX/AUD_IIRFilterReader.cpp
+++ b/intern/audaspace/FX/AUD_IIRFilterReader.cpp
@@ -34,7 +34,7 @@ AUD_IIRFilterReader::AUD_IIRFilterReader(AUD_Reference<AUD_IReader> reader,
 										 const std::vector<float>& a) :
 	AUD_BaseIIRFilterReader(reader, b.size(), a.size()), m_a(a), m_b(b)
 {
-	if(m_a.size())
+	if(m_a.empty() == false)
 	{
 		for(int i = 1; i < m_a.size(); i++)
 			m_a[i] /= m_a[0];
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 71a5dedeaa4..0b6f020ade5 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -26,7 +26,9 @@
 
 #ifndef __KERNEL_OPENCL__
 
-#define _USE_MATH_DEFINES
+#ifdef _MSC_VER
+#  define _USE_MATH_DEFINES
+#endif
 
 #include <float.h>
 #include <math.h>
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index a1ae6bd81c0..a6597986c0a 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -1063,6 +1063,7 @@ static int Build4RuleGroups(STriInfo pTriInfos[], SGroup pGroups[], int piGroupT
 	const int iNrMaxGroups = iNrTrianglesIn*3;
 	int iNrActiveGroups = 0;
 	int iOffset = 0, f=0, i=0;
+	(void)iNrMaxGroups;  /* quiet warnings in non debug mode */
 	for (f=0; f<iNrTrianglesIn; f++)
 	{
 		for (i=0; i<3; i++)
@@ -1094,6 +1095,7 @@ static int Build4RuleGroups(STriInfo pTriInfos[], SGroup pGroups[], int piGroupT
 					const tbool bOrPre2 = (pTriInfos[neigh_indexL].iFlag&ORIENT_PRESERVING)!=0 ? TTRUE : TFALSE;
 					const tbool bDiff = bOrPre!=bOrPre2 ? TTRUE : TFALSE;
 					assert(bAnswer || bDiff);
+					(void)bAnswer, (void)bDiff;  /* quiet warnings in non debug mode */
 				}
 				if (neigh_indexR>=0) // neighbor
 				{
@@ -1104,6 +1106,7 @@ static int Build4RuleGroups(STriInfo pTriInfos[], SGroup pGroups[], int piGroupT
 					const tbool bOrPre2 = (pTriInfos[neigh_indexR].iFlag&ORIENT_PRESERVING)!=0 ? TTRUE : TFALSE;
 					const tbool bDiff = bOrPre!=bOrPre2 ? TTRUE : TFALSE;
 					assert(bAnswer || bDiff);
+					(void)bAnswer, (void)bDiff;  /* quiet warnings in non debug mode */
 				}
 
 				// update offset
diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
index 92ec695baf0..c79bcc4a76d 100644
--- a/intern/raskter/raskter.c
+++ b/intern/raskter/raskter.c
@@ -35,7 +35,6 @@
 /* from BLI_utildefines.h */
 #define MIN2(x, y)               ( (x) < (y) ? (x) : (y) )
 #define MAX2(x, y)               ( (x) > (y) ? (x) : (y) )
-#define ABS(a)                   ( (a) < 0 ? (-(a)) : (a) )
 
 struct PolyVert {
 	int x;
-- 
cgit v1.2.3