get rid of some more warnings

This commit is contained in:
Greg Landrum
2015-11-14 09:21:05 +01:00
parent b83b71aac0
commit 2a75463959
5 changed files with 7 additions and 5 deletions

View File

@@ -41,7 +41,7 @@ ExplicitBitVect::ExplicitBitVect(const char *data,const unsigned int dataLen)
initFromText(data,dataLen);
}
ExplicitBitVect::ExplicitBitVect(const ExplicitBitVect& other){
ExplicitBitVect::ExplicitBitVect(const ExplicitBitVect& other) : BitVect(other) {
d_size = other.d_size;
dp_bits = new boost::dynamic_bitset<>(*(other.dp_bits));
d_numOnBits=other.d_numOnBits;

View File

@@ -39,7 +39,7 @@ public:
explicit SparseBitVect(unsigned int size): dp_bits(0), d_size(0) {_initForSize(size); };
//! copy constructor
SparseBitVect(const SparseBitVect& other){
SparseBitVect(const SparseBitVect& other) : BitVect(other) {
d_size=0;dp_bits = 0;
_initForSize(other.getNumBits());
IntSet *bv=other.dp_bits;

View File

@@ -75,7 +75,7 @@ namespace RDKit{
//! set the value at an index
void setVal(IndexType idx, int val){
if(idx<0||idx>=d_length){
if(idx>=d_length){
throw IndexErrorException(static_cast<int>(idx));
}
if(val!=0){
@@ -86,7 +86,7 @@ namespace RDKit{
};
#ifdef __clang__
#pragma clang diagnostic pop
#elif defined(__GNUC__) || defined(__GNUG__) && \
#elif ( defined(__GNUC__) || defined(__GNUG__) ) && \
( __GNUC__ > 4 || \
(__GNUC__ == 4 && __GNUC_MINOR__ > 1 ) )
#pragma GCC diagnostic pop

View File

@@ -252,6 +252,7 @@ namespace DistGeom {
const std::vector<std::pair<std::vector<int>, std::vector<double> > > &expTorsionAngles,
const std::vector<std::vector<int> > &improperAtoms,
const std::vector<int> &atomNums) {
(void)atomNums;
unsigned int N = mmat.numRows();
CHECK_INVARIANT(N == positions.size(), "");
CHECK_INVARIANT(expTorsionAtoms.size() == expTorsionAngles.size(), "");
@@ -377,6 +378,7 @@ namespace DistGeom {
const std::vector<std::vector<int> > &expTorsionAtoms,
const std::vector<std::pair<std::vector<int>, std::vector<double> > > &expTorsionAngles,
const std::vector<int> &atomNums) {
(void)atomNums;
unsigned int N = mmat.numRows();
CHECK_INVARIANT(N == positions.size(), "");
CHECK_INVARIANT(expTorsionAtoms.size() == expTorsionAngles.size(), "");

View File

@@ -23,7 +23,7 @@ using namespace RDKit;
namespace RDGeom {
unsigned int ci_GRIDPICKLE_VERSION=0x1;
UniformGrid3D::UniformGrid3D(const UniformGrid3D &other){
UniformGrid3D::UniformGrid3D(const UniformGrid3D &other) : Grid3D(other) {
PRECONDITION(other.dp_storage,"cannot copy an unintialized grid");
RDKit::DiscreteValueVect *data=new RDKit::DiscreteValueVect(*other.dp_storage);
initGrid(other.d_numX*other.d_spacing,