From 1d3b259c0ab427c2c26009a6d8bda75ef3e67eec Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed, 30 Jun 2021 11:59:16 +0200
Subject: [PATCH] Fixed incorrect use of _NDEBUG instead of NDEBUG Some
 debugging code was compiled even in release mode because of this

---
 src/libslic3r/AppConfig.hpp        |  4 ++--
 src/libslic3r/MutablePolygon.cpp   |  2 +-
 src/libslic3r/TriangleSelector.cpp | 22 +++++++++++-----------
 src/libslic3r/TriangleSelector.hpp |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
index d4f125f60..07b09c5c8 100644
--- a/src/libslic3r/AppConfig.hpp
+++ b/src/libslic3r/AppConfig.hpp
@@ -63,12 +63,12 @@ public:
 		{ std::string value; this->get("", key, value); return value; }
 	void			    set(const std::string &section, const std::string &key, const std::string &value)
 	{
-#ifndef _NDEBUG
+#ifndef NDEBUG
 		std::string key_trimmed = key;
 		boost::trim_all(key_trimmed);
 		assert(key_trimmed == key);
 		assert(! key_trimmed.empty());
-#endif // _NDEBUG
+#endif // NDEBUG
 		std::string &old = m_storage[section][key];
 		if (old != value) {
 			old = value;
diff --git a/src/libslic3r/MutablePolygon.cpp b/src/libslic3r/MutablePolygon.cpp
index dc1d47731..403d625bf 100644
--- a/src/libslic3r/MutablePolygon.cpp
+++ b/src/libslic3r/MutablePolygon.cpp
@@ -166,7 +166,7 @@ static bool clip_narrow_corner(
             assert(orient1 > 0 == blocked);
             assert(orient2 > 0 == blocked);
         }
-#endif // _NDEBUG
+#endif // NDEBUG
         if (polygon.size() < 3 || (forward == Far && backward == Far)) {
             polygon.clear();
         } else {
diff --git a/src/libslic3r/TriangleSelector.cpp b/src/libslic3r/TriangleSelector.cpp
index d7efd09b1..a3f342319 100644
--- a/src/libslic3r/TriangleSelector.cpp
+++ b/src/libslic3r/TriangleSelector.cpp
@@ -3,9 +3,9 @@
 
 #include <boost/container/small_vector.hpp>
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
     #define EXPENSIVE_DEBUG_CHECKS
-#endif // _NDEBUG
+#endif // NDEBUG
 
 namespace Slic3r {
 
@@ -19,7 +19,7 @@ static inline Vec3i root_neighbors(const TriangleMesh &mesh, int triangle_id)
     return neighbors;
 }
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
 bool TriangleSelector::verify_triangle_midpoints(const Triangle &tr) const
 {
     for (int i = 0; i < 3; ++ i) {
@@ -57,7 +57,7 @@ bool TriangleSelector::verify_triangle_neighbors(const Triangle &tr, const Vec3i
         }
     return true;
 }
-#endif // _NDEBUG
+#endif // NDEBUG
 
 // sides_to_split==-1 : just restore previous split
 void TriangleSelector::Triangle::set_division(int sides_to_split, int special_side_idx)
@@ -308,12 +308,12 @@ int TriangleSelector::triangle_midpoint_or_allocate(int itriangle, int vertexi,
         }
         assert(m_vertices[midpoint].ref_cnt == 0);
     } else {
-#ifndef _NDEBUG
+#ifndef NDEBUG
         Vec3f c1 = 0.5f * (m_vertices[vertexi].v + m_vertices[vertexj].v);
         Vec3f c2 = m_vertices[midpoint].v;
         float d = (c2 - c1).norm();
         assert(std::abs(d) < EPSILON);
-#endif // _NDEBUG
+#endif // NDEBUG
         assert(m_vertices[midpoint].ref_cnt > 0);
     }
     return midpoint;
@@ -816,13 +816,13 @@ void TriangleSelector::perform_split(int facet_idx, const Vec3i &neighbors, Enfo
     assert(tr.is_split());
 
     // indices of triangle vertices
-#ifdef _NDEBUG
+#ifdef NDEBUG
     boost::container::small_vector<int, 6> verts_idxs;
-#else // _NDEBUG
+#else // NDEBUG
     // For easier debugging.
     std::vector<int> verts_idxs;
     verts_idxs.reserve(6);
-#endif // _NDEBUG
+#endif // NDEBUG
     for (int j=0, idx = tr.special_side(); j<3; ++j, idx = next_idx_modulo(idx, 3))
         verts_idxs.push_back(tr.verts_idxs[idx]);
 
@@ -861,13 +861,13 @@ void TriangleSelector::perform_split(int facet_idx, const Vec3i &neighbors, Enfo
         break;
     }
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
     assert(this->verify_triangle_neighbors(tr, neighbors));
     for (int i = 0; i <= tr.number_of_split_sides(); ++i) {
         Vec3i n = this->child_neighbors(tr, neighbors, i);
         assert(this->verify_triangle_neighbors(m_triangles[tr.children[i]], n));
     }
-#endif // _NDEBUG
+#endif // NDEBUG
 }
 
 bool TriangleSelector::has_facets(EnforcerBlockerType state) const
diff --git a/src/libslic3r/TriangleSelector.hpp b/src/libslic3r/TriangleSelector.hpp
index 5115bb02a..6efae2150 100644
--- a/src/libslic3r/TriangleSelector.hpp
+++ b/src/libslic3r/TriangleSelector.hpp
@@ -204,10 +204,10 @@ private:
     int triangle_midpoint(int itriangle, int vertexi, int vertexj) const;
     int triangle_midpoint_or_allocate(int itriangle, int vertexi, int vertexj);
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
     bool verify_triangle_neighbors(const Triangle& tr, const Vec3i& neighbors) const;
     bool verify_triangle_midpoints(const Triangle& tr) const;
-#endif // _NDEBUG
+#endif // NDEBUG
 
     void get_facets_strict_recursive(
         const Triangle                              &tr,