From f2412483a0fca0fe71cfe2e1c5ea3a196d480b8e Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 16 Oct 2014 16:37:55 +0100 Subject: [PATCH] Fixed mistakes detected by clang. --- src/blackmisc/dictionary.h | 4 ++-- src/blackmisc/geodesicgrid.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index 4d7aad939..1245d928e 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -313,7 +313,7 @@ namespace BlackMisc iterator find(const Key &key) { return m_impl.find(key); } //! Returns true if dictionary contains an item with key, otherwise false - bool contains (const Key &key) const {return m_impl.contains(); } + bool contains (const Key &key) const {return m_impl.contains(key); } //! Returns the number of items with key int count(const Key &key) const { return m_impl.count(key); } @@ -355,7 +355,7 @@ namespace BlackMisc const Value value(const Key &key) const { return m_impl.value(key); } //! Returns the value associated with the key or if key is not found defaultValue - const Value value(const Key &key, const Value &defaultValue) const { return m_impl.value(key); } + const Value value(const Key &key, const Value &defaultValue) const { return m_impl.value(key, defaultValue); } //! Return a range of all values CRange values() const { return makeRange(begin(), end()); } diff --git a/src/blackmisc/geodesicgrid.h b/src/blackmisc/geodesicgrid.h index 693857c45..3da671b94 100644 --- a/src/blackmisc/geodesicgrid.h +++ b/src/blackmisc/geodesicgrid.h @@ -94,7 +94,7 @@ namespace BlackMisc //! Overloaded method taking the coordinates in a different form. //! @{ void insert(const CLatitude &lat, const CLongitude &lon, const T &value) { insert(lat.value(PhysicalQuantities::CAngleUnit::rad()), lon.value(PhysicalQuantities::CAngleUnit::rad()), value); } - void insert(const ICoordinateGeodetic &coord, const T &value) { insert(coord.latitude(), coord.longitude()); } + void insert(const ICoordinateGeodetic &coord, const T &value) { insert(coord.latitude(), coord.longitude(), value); } CRange inTileAt(const CLatitude &lat, const CLongitude &lon) const { return inTileAt(lat.value(PhysicalQuantities::CAngleUnit::rad()), lon.value(PhysicalQuantities::CAngleUnit::rad())); } CRange inTileAt(const ICoordinateGeodetic &coord) const { return inTileAt(coord.latitude(), coord.longitude()); } CRange> inAdjacentTiles(const CLatitude &lat, const CLongitude &lon, int degree = 1) const { return inAdjacentTiles(lat.value(PhysicalQuantities::CAngleUnit::rad()), lon.value(PhysicalQuantities::CAngleUnit::rad()), degree); }