Fix return function and unsigned/sign comparaison

mjwybrow · Feb 5, 2024 · b5cc581 · b5cc581
1 parent d748672
commit b5cc581
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/cola/libdialect/ortho.cpp b/cola/libdialect/ortho.cpp
@@ -252,6 +252,9 @@ std::string Compass::dirToString(CompassDir d) {
     case CompassDir::SW: return "SW";
     case CompassDir::NW: return "NW";
     case CompassDir::NE: return "NE";
+    default :
+        COLA_ASSERT(false);
+        return "EAST";
     }
 }
 

diff --git a/cola/libdialect/quadaction.cpp b/cola/libdialect/quadaction.cpp
@@ -107,9 +107,9 @@ string Assignment::toString() const {
     return s;
 }
 
-Quad::Quad(unsigned num) : num(num) {
+Quad::Quad(unsigned int num) : num(num) {
     // The only valid num's for quadrants are 0, 1, 2, 3.
-    COLA_ASSERT(0U <= num && num <= 3U);
+    COLA_ASSERT(0 <= (int) num && num <= 3);
 }
 
 void Quad::sortAndComputeCosts() {

diff --git a/cola/libdialect/quadaction.h b/cola/libdialect/quadaction.h
@@ -141,7 +141,7 @@ struct Quad {
     //! @brief  Standard constructor.
     //!
     //! @param[in]  num  The number of this quadrant in {0, 1, 2, 3}
-    Quad(unsigned num);
+    Quad(unsigned int num);
 
     //! @brief  Add a neighbour.
     void addNbr(const Nbr_SP &nbr) { nbrs.push_back(nbr); }

diff --git a/cola/libdialect/routing.cpp b/cola/libdialect/routing.cpp
@@ -147,7 +147,7 @@ void RoutingAdapter::recordRoutes(bool refine) {
             vector<Point> refined_pts;
             size_t N = pts.size() - 2;  // the number of interior points
             // We expect that there are at least two route points.
-            COLA_ASSERT(N >= 0U);
+            COLA_ASSERT((int) N >= 0);
             size_t i = 0;
             // We always keep the first route point.
             refined_pts.push_back(pts[0]);