trying to fix build errors on windows

wkjarosz · Nov 27, 2023 · 0f25916 · 0f25916
1 parent 844c228
commit 0f25916
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/gui/SampleViewer.cpp b/gui/SampleViewer.cpp
@@ -10,6 +10,12 @@
 namespace fs = std::filesystem;
 using namespace linalg::ostream_overloads;
 
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::ofstream;
+using std::to_string;
+
 #include "hello_imgui/hello_imgui.h"
 #include "imgui.h"
 #include "imgui_internal.h"
@@ -272,7 +278,7 @@ int2 SampleViewer::get_draw_range() const
 {
     int start = 0, count = m_point_count;
     if (m_subset_by_coord)
-        count = min(count, m_subset_count);
+        count = std::min(count, m_subset_count);
     else if (m_subset_by_index)
     {
         start = m_first_draw_point;
@@ -422,8 +428,8 @@ void SampleViewer::draw_editor()
         if (accept_keys && (ImGui::IsKeyPressed(ImGuiKey_LeftArrow) || ImGui::IsKeyPressed(ImGuiKey_RightArrow)))
         {
             m_target_point_count =
-                max(1u, ImGui::IsKeyPressed(ImGuiKey_RightArrow) ? roundUpPow2(m_target_point_count + 1)
-                                                                 : roundDownPow2(m_target_point_count - 1));
+                std::max(1u, ImGui::IsKeyPressed(ImGuiKey_RightArrow) ? roundUpPow2(m_target_point_count + 1)
+                                                                      : roundDownPow2(m_target_point_count - 1));
             update_GPU_points();
             update_GPU_grids();
         }

diff --git a/gui/SampleViewer.h b/gui/SampleViewer.h
@@ -39,7 +39,9 @@ using namespace linalg::aliases;
 #include <string>
 #include <vector>
 
-using namespace std;
+using std::ofstream;
+using std::string;
+using std::vector;
 
 enum PointType
 {

diff --git a/gui/gui_app.cpp b/gui/gui_app.cpp
@@ -129,7 +129,7 @@ void GUIApp::register_callbacks()
 
 void GUIApp::cursor_pos_event(double x, double y)
 {
-    int2 p{x, y};
+    int2 p{int(x), int(y)};
 
 #if defined(_WIN32) || defined(__linux__) || defined(EMSCRIPTEN)
     p = int2(float2(p) / m_pixel_ratio);