more warning suppression in Graphite code

git-svn-id: svn://tug.org/texlive/trunk@6877 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 21 insertions, 6 deletions

diff --git a/Build/source/libs/graphite-engine/src/font/TtfUtil.cpp b/Build/source/libs/graphite-engine/src/font/TtfUtil.cpp
index 0015ccf003d..471b7eeca2c 100644
--- a/Build/source/libs/graphite-engine/src/font/TtfUtil.cpp
+++ b/Build/source/libs/graphite-engine/src/font/TtfUtil.cpp
@@ -21,6 +21,8 @@ Description:
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
+#include <cstring>
+#include <climits>
 #include <stdexcept>
 // Platform headers
 // Module headers
diff --git a/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp b/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp
index 559f72fb887..ee92cbe8caf 100644
--- a/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp
+++ b/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp
@@ -2603,7 +2603,7 @@ bool SegmentPainter::ArrowKeyPositionInternal(
 			{
 				//	Switching fAPNew would cause us to move in the opposite direction, so
 				//	that's not a good solution. Keep going.
-				if (iginfStart == 0 && !fForward || iginfStart == m_pseg->m_cginf && fForward)
+				if ((iginfStart == 0 && !fForward) || (iginfStart == m_pseg->m_cginf && fForward))
 				{
 					//	Can't go any further, so go with this even though AP is wrong.
 				}
diff --git a/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp b/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp
index 57d2a2ba16e..1f1e51eaf23 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrEngine.cpp
@@ -16,6 +16,7 @@ Description: Contains the implementation of the GrEngine class.
 //:>********************************************************************************************
 #include "Main.h"
 #include <functional>
+#include <cstring>
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
diff --git a/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp b/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp
index c36670c9634..7421cc037cc 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrFSM.cpp
@@ -16,6 +16,9 @@ Description:
 //:>	   Include files
 //:>********************************************************************************************
 #include "Main.h"
+
+#include <cstring>
+
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
diff --git a/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp b/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp
index 7863220b80a..c018ebf50b1 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrFeature.cpp
@@ -17,6 +17,8 @@ Description:
 //:>********************************************************************************************
 #include "Main.h"
 
+#include <cstring>
+
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
diff --git a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp
index cc125a3d9b3..78095bdc189 100644
--- a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp
@@ -1459,7 +1459,7 @@ void GrTableManager::AdjustAssocsForOverlaps(Segment * pseg)
 			}
 		}
 
-		if (m_engst.m_fFinalLB || m_engst.m_fInsertedLB && ipass > m_cpassLB)
+		if ((m_engst.m_fFinalLB || m_engst.m_fInsertedLB) && ipass > m_cpassLB)
 		{
 			for (int islot = psstrm->WritePos(); islot-- > islotMin ; )
 			{
diff --git a/Build/source/libs/graphite-engine/src/segment/MemoryUsage.cpp b/Build/source/libs/graphite-engine/src/segment/MemoryUsage.cpp
index ac693b5b1d4..1fb3fc25282 100644
--- a/Build/source/libs/graphite-engine/src/segment/MemoryUsage.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/MemoryUsage.cpp
@@ -27,6 +27,7 @@ Description:
 #include "GrDebug.h"
 //#include <fstream>
 #include <iostream>
+#include <cstring>
 //#include <string>
 // Forward declarations.
 
diff --git a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp
index 782732ad325..78e46b9b5fd 100644
--- a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp
+++ b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp
@@ -733,8 +733,8 @@ void GrTableManager::LogAttributes(std::ostream & strmOut, int ipass,
 	//	Figure out which slot attributes were modified for some slot during the pass.
 	bool * prgfMods = new bool[kslatMax + NumUserDefn() - 1];
 
-	bool fPreJust = (!fJustWidths && ipass == m_ipassJust1 - 1 && ShouldLogJustification());
-	bool fPostJust = (fJustWidths || ipass == m_ipassJust1 && ShouldLogJustification());
+	bool fPreJust  = (!fJustWidths && ipass == m_ipassJust1 - 1 && ShouldLogJustification());
+	bool fPostJust = ((fJustWidths || ipass == m_ipassJust1)    && ShouldLogJustification());
 
 	int ccomp;	// max number of components per slot
 	int cassoc;	// max number of associations per slot
diff --git a/Build/source/libs/graphite-engine/test/ProfileHarness/ProfileHarness.cpp b/Build/source/libs/graphite-engine/test/ProfileHarness/ProfileHarness.cpp
index 168f22a7250..361d6a6b734 100644
--- a/Build/source/libs/graphite-engine/test/ProfileHarness/ProfileHarness.cpp
+++ b/Build/source/libs/graphite-engine/test/ProfileHarness/ProfileHarness.cpp
@@ -22,6 +22,7 @@ diagnostic log of the segment creation in grSegmentLog.txt
 #include <iomanip>
 #include <string>
 #include <sstream>
+#include <cstring>
 
 #include <graphite/GrClient.h>
 #include <graphite/ITextSource.h>
diff --git a/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp b/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp
index 0054e9e1eeb..1545a173e93 100644
--- a/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp
+++ b/Build/source/libs/graphite-engine/test/RegressionTest/RegressionTest.cpp
@@ -15,6 +15,8 @@ Description:
 #include "main.h"
 #include "MemoryUsage.h"
 
+#include <cstring>
+
 //:>********************************************************************************************
 //:>	Global variables
 //:>********************************************************************************************
@@ -414,8 +416,8 @@ int RunOneTestCase(TestCase * ptcase, Segment * psegPrev, Segment ** ppsegRet, R
 		for (int ichar = 0; ichar < segLim; ichar++)
 		{
 			LgIpValidResult ipvr = ppainter->isValidInsertionPoint(ichar);
-			if ((ipvr == kipvrOK && !ptcase->InsPtFlag(ichar)) // TODO: handle kipvrUnknown
-				|| ipvr != kipvrOK && ptcase->InsPtFlag(ichar))
+			if (((ipvr == kipvrOK && !ptcase->InsPtFlag(ichar))) // TODO: handle kipvrUnknown
+				|| (ipvr != kipvrOK && ptcase->InsPtFlag(ichar)))
 			{
 				OutputErrorWithValues(ptcase, "ERROR: valid insertion point ", ichar,
 					(ipvr == kipvrOK), ptcase->InsPtFlag(ichar));
diff --git a/Build/source/libs/graphite-engine/test/RegressionTest/RtTextSrc.h b/Build/source/libs/graphite-engine/test/RegressionTest/RtTextSrc.h
index a49a54c4d28..cdbd51e90df 100644
--- a/Build/source/libs/graphite-engine/test/RegressionTest/RtTextSrc.h
+++ b/Build/source/libs/graphite-engine/test/RegressionTest/RtTextSrc.h
@@ -15,6 +15,7 @@ Description:
 #ifndef RTTXTSRC_INCLUDED

 #define RTTXTSRC_INCLUDED

 

+#include <cstring>

 

 /*----------------------------------------------------------------------------------------------

 	Class: RtTextSrc

diff --git a/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp b/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp
index 6aa83a4b2f6..e259ce66ffb 100644
--- a/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp
+++ b/Build/source/libs/graphite-engine/test/RegressionTest/TestCase.cpp
@@ -26,6 +26,8 @@ Things that still need testing:
 
 #include "main.h"
 
+#include <cstring>
+
 //:>********************************************************************************************
 //:>	Test constants and methods
 //:>********************************************************************************************