1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
Description: New gcc/boost fail to cast tribool to bool, force it.
Author: Dimitri John Ledkov <xnox@ubuntu.com>
diff --git a/pwiz/data/identdata/IdentData.cpp b/pwiz/data/identdata/IdentData.cpp
index c6dd6ce..1dc8188 100644
--- a/pwiz/data/identdata/IdentData.cpp
+++ b/pwiz/data/identdata/IdentData.cpp
@@ -1047,7 +1047,7 @@ PWIZ_API_DECL proteome::DigestedPeptide digestedPeptide(const SpectrumIdentifica
BOOST_FOREACH(CVID cleavageAgent, cleavageAgents)
{
if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, cleavageAgent, "",
- sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+ (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
bestSpecificity, bestResult))
break;
}
@@ -1055,7 +1055,7 @@ PWIZ_API_DECL proteome::DigestedPeptide digestedPeptide(const SpectrumIdentifica
BOOST_FOREACH(const string& regex, cleavageAgentRegexes)
{
if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, CVID_Unknown, regex,
- sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+ (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
bestSpecificity, bestResult))
break;
}
@@ -1109,7 +1109,7 @@ PWIZ_API_DECL vector<proteome::DigestedPeptide> digestedPeptides(const SpectrumI
BOOST_FOREACH(CVID cleavageAgent, cleavageAgents)
{
if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, cleavageAgent, "",
- sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+ (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
bestSpecificity, bestResult))
break;
}
@@ -1117,7 +1117,7 @@ PWIZ_API_DECL vector<proteome::DigestedPeptide> digestedPeptides(const SpectrumI
BOOST_FOREACH(const string& regex, cleavageAgentRegexes)
{
if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, CVID_Unknown, regex,
- sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+ (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
bestSpecificity, bestResult))
break;
}
diff --git a/pwiz/data/identdata/Serializer_pepXML.cpp b/pwiz/data/identdata/Serializer_pepXML.cpp
index 906fbc5..a02efb0 100644
--- a/pwiz/data/identdata/Serializer_pepXML.cpp
+++ b/pwiz/data/identdata/Serializer_pepXML.cpp
@@ -409,7 +409,7 @@ struct EnzymePtr_minDistance
void write_sample_enzyme(XMLWriter& xmlWriter, const IdentData& mzid)
{
const SpectrumIdentificationProtocol& sip = *mzid.analysisProtocolCollection.spectrumIdentificationProtocol[0];
- bool independent = sip.enzymes.independent;
+ bool independent = (bool) sip.enzymes.independent;
// create a cumulative enzyme name for multiple enzymes like "Trypsin + AspN + Chymotrypsin"
string enzymeName = bal::join(sip.enzymes.enzymes | boost::adaptors::transformed(EnzymePtr_name()), " + ");
diff --git a/pwiz/data/identdata/TextWriter.hpp b/pwiz/data/identdata/TextWriter.hpp
index f441027..eaddc5d 100644
--- a/pwiz/data/identdata/TextWriter.hpp
+++ b/pwiz/data/identdata/TextWriter.hpp
@@ -506,7 +506,7 @@ class PWIZ_API_DECL TextWriter
{
(*this)("Enzymes: ");
if (!indeterminate(ezs.independent))
- child()("independent: ", ezs.independent);
+ child()("independent: ", (bool) ezs.independent);
if (!ezs.enzymes.empty())
child()("enzymes: ", ezs.enzymes);
return *this;
|
