summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite-engine/src/segment
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2008-03-07 16:25:23 +0000
committerJonathan Kew <jfkthame@googlemail.com>2008-03-07 16:25:23 +0000
commit07ef9a58959abb19cc897735e4bb81727276b4fe (patch)
tree06b020e194fbb8f79a5aad04d58c219a24fe06e4 /Build/source/libs/graphite-engine/src/segment
parent9fd5583d1d3a628142c0386dd733a70f4a91cecb (diff)
more warning suppression in Graphite code
git-svn-id: svn://tug.org/texlive/trunk@6877 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite-engine/src/segment')
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrEngine.cpp1
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrFSM.cpp3
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrFeature.cpp2
-rw-r--r--Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp2
-rw-r--r--Build/source/libs/graphite-engine/src/segment/MemoryUsage.cpp1
-rw-r--r--Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp4
6 files changed, 10 insertions, 3 deletions
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