Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2016-12-25 17:20:18 +0300
committervng <viktor.govako@gmail.com>2016-12-25 17:20:18 +0300
commit4b24b9f7c5190c120233558ae425b3bffb9197df (patch)
tree70f8a5fc0552067f1f11fe882bc8cc6d909fdeda
parent7a6f5e7081467112c6f94e9d9100aadac5f22207 (diff)
Fixed most of “unused var” warnings.
-rw-r--r--drape/oglcontext.hpp2
-rw-r--r--drape/texture.hpp2
-rw-r--r--drape/texture_manager.hpp2
-rw-r--r--drape_frontend/gui/shape.hpp2
-rw-r--r--drape_frontend/map_shape.hpp2
-rw-r--r--indexer/mwm_set.hpp7
-rw-r--r--routing/osrm_data_facade.hpp52
7 files changed, 36 insertions, 33 deletions
diff --git a/drape/oglcontext.hpp b/drape/oglcontext.hpp
index bc33c9f462..9c55ff1345 100644
--- a/drape/oglcontext.hpp
+++ b/drape/oglcontext.hpp
@@ -13,7 +13,7 @@ public:
virtual void setDefaultFramebuffer() = 0;
/// @ param w, h - pixel size of render target (logical size * visual scale)
virtual void resize(int /*w*/, int /*h*/) {}
- virtual void setRenderingEnabled(bool enabled) {}
+ virtual void setRenderingEnabled(bool /*enabled*/) {}
};
} // namespace dp
diff --git a/drape/texture.hpp b/drape/texture.hpp
index b102f94598..a9b0051bd3 100644
--- a/drape/texture.hpp
+++ b/drape/texture.hpp
@@ -51,7 +51,7 @@ public:
virtual ref_ptr<ResourceInfo> FindResource(Key const & key, bool & newResource) = 0;
virtual void UpdateState() {}
virtual bool HasAsyncRoutines() const { return false; }
- virtual bool HasEnoughSpace(uint32_t newKeysCount) const { return true; }
+ virtual bool HasEnoughSpace(uint32_t /*newKeysCount*/) const { return true; }
using Params = HWTexture::Params;
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp
index f820e6729f..daac7c7fc5 100644
--- a/drape/texture_manager.hpp
+++ b/drape/texture_manager.hpp
@@ -147,7 +147,7 @@ private:
void MarkCharactersUsage(strings::UniString const & text, HybridGlyphGroup & group);
/// it's a dummy method to support generic code
- void MarkCharactersUsage(strings::UniString const & text, GlyphGroup & group) {}
+ void MarkCharactersUsage(strings::UniString const &, GlyphGroup &) {}
template<typename TGlyphGroup>
void FillResultBuffer(strings::UniString const & text, TGlyphGroup & group, TGlyphsBuffer & regions)
diff --git a/drape_frontend/gui/shape.hpp b/drape_frontend/gui/shape.hpp
index 700be42ae3..9b0584db8a 100644
--- a/drape_frontend/gui/shape.hpp
+++ b/drape_frontend/gui/shape.hpp
@@ -22,7 +22,7 @@ public:
bool Update(ScreenBase const & screen) override;
- virtual bool IsTapped(m2::RectD const & touchArea) const { return false; }
+ virtual bool IsTapped(m2::RectD const & /*touchArea*/) const { return false; }
virtual void OnTapBegin(){}
virtual void OnTap(){}
virtual void OnTapEnd(){}
diff --git a/drape_frontend/map_shape.hpp b/drape_frontend/map_shape.hpp
index a26723ffa3..33044c8d58 100644
--- a/drape_frontend/map_shape.hpp
+++ b/drape_frontend/map_shape.hpp
@@ -28,7 +28,7 @@ class MapShape
{
public:
virtual ~MapShape(){}
- virtual void Prepare(ref_ptr<dp::TextureManager> textures) const {}
+ virtual void Prepare(ref_ptr<dp::TextureManager> /*textures*/) const {}
virtual void Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures) const = 0;
virtual MapShapeType GetType() const { return MapShapeType::GeometryType; }
diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp
index 9a334316e2..9604f20e97 100644
--- a/indexer/mwm_set.hpp
+++ b/indexer/mwm_set.hpp
@@ -235,15 +235,16 @@ public:
// Called when a map is registered for a first time and can be
// used.
- virtual void OnMapRegistered(platform::LocalCountryFile const & localFile) {}
+ virtual void OnMapRegistered(platform::LocalCountryFile const & /*localFile*/) {}
// Called when a map is updated to a newer version. Feel free to
// treat it as combined OnMapRegistered(newFile) +
// OnMapRegistered(oldFile).
- virtual void OnMapUpdated(platform::LocalCountryFile const & newFile, platform::LocalCountryFile const & oldFile) {}
+ virtual void OnMapUpdated(platform::LocalCountryFile const & /*newFile*/,
+ platform::LocalCountryFile const & /*oldFile*/) {}
// Called when a map is deregistered and can no longer be used.
- virtual void OnMapDeregistered(platform::LocalCountryFile const & localFile) {}
+ virtual void OnMapDeregistered(platform::LocalCountryFile const & /*localFile*/) {}
};
/// Registers a new map.
diff --git a/routing/osrm_data_facade.hpp b/routing/osrm_data_facade.hpp
index db00aed20d..10010c5084 100644
--- a/routing/osrm_data_facade.hpp
+++ b/routing/osrm_data_facade.hpp
@@ -101,7 +101,7 @@ public:
return res;
}
- EdgeDataT & GetEdgeData(const EdgeID e) const override
+ EdgeDataT & GetEdgeData(const EdgeID) const override
{
static EdgeDataT res;
ASSERT(false, ("Maps me routing facade does not supports this edge unpacking method"));
@@ -109,7 +109,7 @@ public:
}
//! TODO: Make proper travelmode getter when we add it to routing file
- TravelMode GetTravelModeForEdgeID(const unsigned id) const override
+ TravelMode GetTravelModeForEdgeID(const unsigned) const override
{
return TRAVEL_MODE_DEFAULT;
}
@@ -149,44 +149,44 @@ public:
return smallest_edge;
}
- EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const override
+ EdgeID FindEdgeInEitherDirection(const NodeID, const NodeID) const override
{
return (EdgeID)0;
}
- EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const override
+ EdgeID FindEdgeIndicateIfReverse(const NodeID, const NodeID, bool &) const override
{
return (EdgeID)0;
}
// node and edge information access
- FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const override
+ FixedPointCoordinate GetCoordinateOfNode(const unsigned) const override
{
return FixedPointCoordinate();
}
- bool EdgeIsCompressed(const unsigned id) const override
+ bool EdgeIsCompressed(const unsigned) const override
{
return false;
}
- unsigned GetGeometryIndexForEdgeID(const unsigned id) const override
+ unsigned GetGeometryIndexForEdgeID(const unsigned) const override
{
return false;
}
- void GetUncompressedGeometry(const unsigned id, std::vector<unsigned> &result_nodes) const override
+ void GetUncompressedGeometry(const unsigned, std::vector<unsigned> &) const override
{
}
- TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const override
+ TurnInstruction GetTurnInstructionForEdgeID(const unsigned) const override
{
return TurnInstruction::NoTurn;
}
- bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
- FixedPointCoordinate &result,
- const unsigned zoom_level = 18) override
+ bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &,
+ FixedPointCoordinate &,
+ const unsigned = 18) override
{
return false;
}
@@ -206,25 +206,25 @@ public:
return false;
}*/
- bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate & input_coordinate,
- std::vector<PhantomNode> & resulting_phantom_node_vector,
- const unsigned number_of_results) override
+ bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &,
+ std::vector<PhantomNode> &,
+ const unsigned) override
{
return false;
}
- bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate & input_coordinate,
- PhantomNode & resulting_phantom_node) override
+ bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &,
+ PhantomNode &) override
{
return false;
}
bool IncrementalFindPhantomNodeForCoordinateWithMaxDistance(
- const FixedPointCoordinate & input_coordinate,
- std::vector<std::pair<PhantomNode, double>> & resulting_phantom_node_vector,
- const double max_distance,
- const unsigned min_number_of_phantom_nodes,
- const unsigned max_number_of_phantom_nodes) override
+ const FixedPointCoordinate &,
+ std::vector<std::pair<PhantomNode, double>> &,
+ const double,
+ const unsigned,
+ const unsigned) override
{
return false;
}
@@ -234,7 +234,7 @@ public:
return 0;
}
- unsigned GetNameIndexFromEdgeID(const unsigned id) const override
+ unsigned GetNameIndexFromEdgeID(const unsigned) const override
{
return -1;
}
@@ -243,8 +243,10 @@ public:
//{
//}
- std::string get_name_for_id(const unsigned name_id) const override
- {return "";}
+ std::string get_name_for_id(const unsigned) const override
+ {
+ return std::string();
+ }
std::string GetTimestamp() const override
{