From eb4bee9f90dd130edcc42938600422a4a48822ae Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Wed, 17 Jul 2019 12:18:35 +0800
Subject: [PATCH] silence some warnings
---
geometry/Building.cpp | 1 -
routing/ai_router/cognitiveMap/associations.cpp | 3 +--
tinyxml/tinyxmlparser.cpp | 5 ++++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/geometry/Building.cpp b/geometry/Building.cpp
index 76007f22..c6e7e5c2 100644
--- a/geometry/Building.cpp
+++ b/geometry/Building.cpp
@@ -725,7 +725,6 @@ void Building::InitPlatforms()
}//subroom
}//rooms
- return true;
}
bool Building::InitInsideGoals()
{
diff --git a/routing/ai_router/cognitiveMap/associations.cpp b/routing/ai_router/cognitiveMap/associations.cpp
index d6926f8c..08a91925 100644
--- a/routing/ai_router/cognitiveMap/associations.cpp
+++ b/routing/ai_router/cognitiveMap/associations.cpp
@@ -10,7 +10,7 @@ AIAssociation::AIAssociation()
}
-AIAssociation::AIAssociation(const AILandmark *landmark, const AILandmark *associated_landmark, bool connected)
+AIAssociation::AIAssociation(const AILandmark *landmark, const AILandmark *associated_landmark, bool /*connected*/)
{
_landmark=landmark;
_associatedLandmark=associated_landmark;
@@ -58,4 +58,3 @@ bool AIAssociation::operator==(const AIAssociation &asso2) const
{
return this==&asso2;
}
-
diff --git a/tinyxml/tinyxmlparser.cpp b/tinyxml/tinyxmlparser.cpp
index 7d6fc691..12e786e6 100644
--- a/tinyxml/tinyxmlparser.cpp
+++ b/tinyxml/tinyxmlparser.cpp
@@ -111,17 +111,21 @@ void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* leng
--output;
*output = (char)((input | BYTE_MARK) & BYTE_MASK);
input >>= 6;
+ [[fallthrough]];
case 3:
--output;
*output = (char)((input | BYTE_MARK) & BYTE_MASK);
input >>= 6;
+ [[fallthrough]];
case 2:
--output;
*output = (char)((input | BYTE_MARK) & BYTE_MASK);
input >>= 6;
+ [[fallthrough]];
case 1:
--output;
*output = (char)(input | FIRST_BYTE_MARK[*length]);
+ [[fallthrough]];
}
}
@@ -1635,4 +1639,3 @@ bool TiXmlText::Blank() const
return false;
return true;
}
-
--
GitLab