Ignored unreachable code warning when compiling manifold_harmonics with

static linking
BrunoLevy · Aug 7, 2024 · 61ba397 · 61ba397
1 parent 69f3246
commit 61ba397
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/examples/geogram/manifold_harmonics/main.cpp b/src/examples/geogram/manifold_harmonics/main.cpp
@@ -54,6 +54,9 @@ int main(int argc, char** argv) {
     try {
 
 #ifndef GEO_DYNAMIC_LIBS
+        #ifdef GEO_COMPILER_MSVC
+        #pragma warning( disable : 4702) // of course there is unreachable code
+        #endif
         // Manifold Harmonics depend on ARPACK, loaded dynamically by
         // OpenNL, so geogram needs to be compiled with dynamic libs.
         GEO::Logger::err("MH")

diff --git a/src/lib/geogram/basic/line_stream.h b/src/lib/geogram/basic/line_stream.h
@@ -75,7 +75,7 @@ namespace GEO {
      *     }
      * }
      * catch(const std::logic_error& ex) {
-     *     std::cerr << "Got an error: " << ex.what << std::endl;
+     *     std::cerr << "Got an error: " << ex.what() << std::endl;
      * }
      * \endcode
      */

diff --git a/src/lib/geogram/delaunay/CDT_2d.h b/src/lib/geogram/delaunay/CDT_2d.h
@@ -57,7 +57,7 @@ namespace GEO {
 
     /**
      * \brief Forward declaration of a small data structure
-     *  used by CDTBase2d::find_intersected_edges()
+     *  used internally by CDTBase2d::find_intersected_edges()
      */
     struct CDT2d_ConstraintWalker;
 
@@ -213,7 +213,7 @@ namespace GEO {
      * \details
      *  When constraining segments on a CDT2d by calling
      *  insert_constraint(), some segments in the triangulation may
-     *  be included in different constraints (it the constraints are
+     *  be included in several constraints (it the constraints are
      *  co-linear and overlapping).
      *  One iterates on the constraints associated with an edge as follows:
      * \code
@@ -252,7 +252,7 @@ namespace GEO {
     }
 
     /**
-     * \brief Gets an edge constraint fro an edge constraint iterator
+     * \brief Gets an edge constraint from an edge constraint iterator
      * \param[in] ecit the edge constraint iterator. Needs to be a valid
      *   iterator, different from index_t(-1).
      * \return the edge constraint associated with the iterator.

diff --git a/src/lib/geogram_gfx/imgui_ext/imgui_ext.cpp b/src/lib/geogram_gfx/imgui_ext/imgui_ext.cpp
@@ -378,7 +378,7 @@ namespace {
         }
 
         /**
-         * \brief Draws the console and handles the gui.
+         * \brief Draws this FileDialog and handles the gui.
          */
         void draw() {
             if(!visible_) {
@@ -417,7 +417,8 @@ namespace {
 
             if(phone_screen) {
                 if(ImGui::SimpleButton(icon_label(
-                                           "window-close","##file_dialog_close", compact
+                                           "window-close","##file_dialog_close",
+                                           compact
                                        ))) {
                     visible_ = false;
                 }