From a7008bfac93650102a668b2b26e2b4360f9cdf4f Mon Sep 17 00:00:00 2001
From: marco <marco@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Wed, 7 Jul 2010 10:10:34 +0000
Subject: [PATCH] fix warnings/errors detected by clang
As of this commit, we are now able to compile ost
(no gfx/no gui). Unittests are all passing and ost
starts up normally.
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2539 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/mol/base/src/impl/entity_impl.hh | 2 +-
modules/mol/base/src/impl/query_impl.hh | 2 +-
modules/mol/base/tests/test_delete.cc | 14 +++++---------
modules/qa/src/amino_acids.hh | 2 +-
modules/qa/src/solis_torsion_potential.cc | 8 ++++----
modules/qa/src/solis_torsion_statistics.cc | 8 ++++----
modules/seq/alg/src/sequence_identity.hh | 2 +-
7 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/modules/mol/base/src/impl/entity_impl.hh b/modules/mol/base/src/impl/entity_impl.hh
index ae1208f5e..1dd0c21da 100644
--- a/modules/mol/base/src/impl/entity_impl.hh
+++ b/modules/mol/base/src/impl/entity_impl.hh
@@ -75,7 +75,7 @@ typedef enum {
// dirty trace (implies dirty ICS)
DirtyTrace=DirtyICS+4,
DirtyOrganizer=8,
- DisableICS=16,
+ DisableICS=16
} EntityDirtyFlags;
diff --git a/modules/mol/base/src/impl/query_impl.hh b/modules/mol/base/src/impl/query_impl.hh
index 2a025bf4a..d9a28760a 100644
--- a/modules/mol/base/src/impl/query_impl.hh
+++ b/modules/mol/base/src/impl/query_impl.hh
@@ -66,7 +66,7 @@ namespace tok {
None,
UnknownChar,
UnterminatedQuote,
- String,
+ String
}
Type;
}
diff --git a/modules/mol/base/tests/test_delete.cc b/modules/mol/base/tests/test_delete.cc
index 636682201..c117f5d9a 100644
--- a/modules/mol/base/tests/test_delete.cc
+++ b/modules/mol/base/tests/test_delete.cc
@@ -65,20 +65,16 @@ struct Fixture {
AtomHandle ad;
TorsionHandle t;
};
-void test_atom_delete() {
+
+BOOST_AUTO_TEST_SUITE( mol_base )
+
+BOOST_AUTO_TEST_CASE(atom_delete)
+{
Fixture f;
XCSEditor e=f.e.RequestXCSEditor();
e.DeleteAtom(f.ab);
E ev;
BOOST_CHECK_NO_THROW(f.e.Apply(ev));
-
-}
-
-BOOST_AUTO_TEST_SUITE( mol_base )
-
-BOOST_AUTO_TEST_CASE(test_atom_delete)
-{
- test_atom_delete();
}
BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/modules/qa/src/amino_acids.hh b/modules/qa/src/amino_acids.hh
index 809e8066a..d2337068c 100644
--- a/modules/qa/src/amino_acids.hh
+++ b/modules/qa/src/amino_acids.hh
@@ -38,7 +38,7 @@ typedef enum {
Met, Trp, Tyr,
Thr, Val, Ile,
Leu, Gly, Pro,
- His, Phe, Xxx,
+ His, Phe, Xxx
} AminoAcid;
diff --git a/modules/qa/src/solis_torsion_potential.cc b/modules/qa/src/solis_torsion_potential.cc
index 61a4768dd..a7b0ffde0 100644
--- a/modules/qa/src/solis_torsion_potential.cc
+++ b/modules/qa/src/solis_torsion_potential.cc
@@ -33,9 +33,9 @@ namespace ost { namespace qa {
namespace {
-class TorsionEnergyCalc : public mol::EntityVisitor {
+class SolisTorsionEnergyCalc : public mol::EntityVisitor {
public:
- TorsionEnergyCalc(TorsionPotentialSolis::TorsionEnergies& energies,
+ SolisTorsionEnergyCalc(TorsionPotentialSolis::TorsionEnergies& energies,
TorsionPotentialOptsSolis opts):
energies_(energies), prev_(Xxx), center_(Xxx), energy_(0.0),
opts_(opts), num_torsions_(0)
@@ -193,7 +193,7 @@ void TorsionPotentialSolis::SaveToFile(const String& path)
Real TorsionPotentialSolis::GetTotalEnergy(mol::EntityHandle entity)
{
- TorsionEnergyCalc c(energies_, options_);
+ SolisTorsionEnergyCalc c(energies_, options_);
entity.Apply(c);
num_torsions_ = c.GetEnergyCounts();
return c.GetEnergy();
@@ -201,7 +201,7 @@ Real TorsionPotentialSolis::GetTotalEnergy(mol::EntityHandle entity)
Real TorsionPotentialSolis::GetTotalEnergy(mol::EntityView entity)
{
- TorsionEnergyCalc c(energies_, options_);
+ SolisTorsionEnergyCalc c(energies_, options_);
entity.Apply(c);
num_torsions_ = c.GetEnergyCounts();
return c.GetEnergy();
diff --git a/modules/qa/src/solis_torsion_statistics.cc b/modules/qa/src/solis_torsion_statistics.cc
index dde884087..9b48639b8 100644
--- a/modules/qa/src/solis_torsion_statistics.cc
+++ b/modules/qa/src/solis_torsion_statistics.cc
@@ -34,9 +34,9 @@ namespace ost { namespace qa {
namespace {
-class TorsionStat : public mol::EntityVisitor {
+class TorsionStatSolis : public mol::EntityVisitor {
public:
- TorsionStat(TorsionStatisticsSolis::TorsionHistogram& histo):
+ TorsionStatSolis(TorsionStatisticsSolis::TorsionHistogram& histo):
histo_(histo)
{}
@@ -94,13 +94,13 @@ int TorsionStatisticsSolis::GetTorsionBucketSize() const
void TorsionStatisticsSolis::Extract(mol::EntityView view)
{
- TorsionStat stat(histogram_);
+ TorsionStatSolis stat(histogram_);
view.Apply(stat);
}
void TorsionStatisticsSolis::Extract(mol::EntityHandle entity)
{
- TorsionStat stat(histogram_);
+ TorsionStatSolis stat(histogram_);
entity.Apply(stat);
}
diff --git a/modules/seq/alg/src/sequence_identity.hh b/modules/seq/alg/src/sequence_identity.hh
index 4b775ef92..82c6d9cde 100644
--- a/modules/seq/alg/src/sequence_identity.hh
+++ b/modules/seq/alg/src/sequence_identity.hh
@@ -30,7 +30,7 @@ namespace ost { namespace seq { namespace alg {
struct RefMode {
enum Type {
ALIGNMENT=0,
- LONGER_SEQUENCE,
+ LONGER_SEQUENCE
};
};
--
GitLab