Fix includes for stream-related symbols (openscad#5325)

* Add missing <iostream> header for files using any of std::{cin,cout,cerr} * Add missing <ostream> header for files using std::ostream. * Include <sstream> for files using any of std::{stringstream,ostringstream} * Include <ios> for files using std::{hex,dec,ios*}
schiele · Sep 26, 2024 · 50ff1f8 · 50ff1f8
1 parent 2c90f30
commit 50ff1f8
Show file tree

Hide file tree

Showing 90 changed files with 93 additions and 0 deletions.
diff --git a/src/LibraryInfo.cc b/src/LibraryInfo.cc
@@ -1,4 +1,5 @@
 #include "LibraryInfo.h"
+#include <sstream>
 #include <glib.h>
 #include <string>
 #include <vector>

diff --git a/src/RenderStatistic.cc b/src/RenderStatistic.cc
@@ -24,6 +24,7 @@
  */
 
 
+#include <iostream>
 #include <memory>
 #include <fstream>
 #include "json/json.hpp"

diff --git a/src/core/AST.cc b/src/core/AST.cc
@@ -1,4 +1,5 @@
 #include "core/AST.h"
+#include <ostream>
 #include <memory>
 #include <sstream>
 #include <string>

diff --git a/src/core/AST.h b/src/core/AST.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <string>
 #include <memory>
 #include <boost/filesystem.hpp>

diff --git a/src/core/Arguments.cc b/src/core/Arguments.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include "core/Arguments.h"
 #include "core/Expression.h"

diff --git a/src/core/Assignment.cc b/src/core/Assignment.cc
@@ -27,6 +27,7 @@
 #include "core/Assignment.h"
 #include "core/customizer/Annotation.h"
 #include "core/Expression.h"
+#include <ostream>
 #include <sstream>
 #include <string>
 

diff --git a/src/core/Expression.cc b/src/core/Expression.cc
@@ -26,6 +26,7 @@
 #include "utils/compiler_specific.h"
 #include "core/Expression.h"
 #include "core/Value.h"
+#include <ostream>
 #include <cstdint>
 #include <cmath>
 #include <cassert>

diff --git a/src/core/Expression.h b/src/core/Expression.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <utility>
 #include <cstddef>
 #include <functional>

diff --git a/src/core/FunctionType.cc b/src/core/FunctionType.cc
@@ -1,3 +1,4 @@
+#include <ostream>
 #include "core/Value.h"
 #include "core/Expression.h"
 #include "core/FunctionType.h"

diff --git a/src/core/ImportNode.cc b/src/core/ImportNode.cc
@@ -43,6 +43,7 @@
 #include "Feature.h"
 #include "handle_dep.h"
 #include "utils/boost-utils.h"
+#include <ios>
 #include <utility>
 #include <memory>
 #include <sys/types.h>

diff --git a/src/core/LocalScope.cc b/src/core/LocalScope.cc
@@ -1,3 +1,4 @@
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <string>

diff --git a/src/core/LocalScope.h b/src/core/LocalScope.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "core/Assignment.h"
+#include <ostream>
 #include <cstddef>
 #include <unordered_map>
 #include <memory>

diff --git a/src/core/ModuleInstantiation.cc b/src/core/ModuleInstantiation.cc
@@ -1,3 +1,4 @@
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <string>

diff --git a/src/core/ModuleInstantiation.h b/src/core/ModuleInstantiation.h
@@ -2,6 +2,7 @@
 
 #include "core/AST.h"
 #include "core/LocalScope.h"
+#include <ostream>
 #include <memory>
 #include <string>
 #include <utility>

diff --git a/src/core/NodeDumper.cc b/src/core/NodeDumper.cc
@@ -1,6 +1,7 @@
 #include "core/NodeDumper.h"
 #include "core/State.h"
 #include "core/ModuleInstantiation.h"
+#include <ostream>
 #include <string>
 #include <sstream>
 #include <boost/regex.hpp>

diff --git a/src/core/NodeDumper.h b/src/core/NodeDumper.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <sstream>
 #include <memory>
 #include <string>
 #include <unordered_map>

diff --git a/src/core/OffsetNode.cc b/src/core/OffsetNode.cc
@@ -32,6 +32,7 @@
 #include "core/Parameters.h"
 #include "core/Builtins.h"
 
+#include <ios>
 #include <utility>
 #include <memory>
 #include <sstream>

diff --git a/src/core/Parameters.cc b/src/core/Parameters.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <sstream>
 #include <memory>
 #include <cstddef>
 #include <set>

diff --git a/src/core/RotateExtrudeNode.cc b/src/core/RotateExtrudeNode.cc
@@ -33,6 +33,7 @@
 #include "io/fileutils.h"
 #include "core/Builtins.h"
 #include "handle_dep.h"
+#include <ios>
 #include <utility>
 #include <memory>
 #include <cmath>

diff --git a/src/core/SourceFile.cc b/src/core/SourceFile.cc
@@ -32,6 +32,7 @@
 #include "core/ScopeContext.h"
 #include "core/parsersettings.h"
 #include "core/StatCache.h"
+#include <ostream>
 #include <memory>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>

diff --git a/src/core/SourceFile.h b/src/core/SourceFile.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <unordered_map>

diff --git a/src/core/UserModule.cc b/src/core/UserModule.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include <vector>
 

diff --git a/src/core/UserModule.h b/src/core/UserModule.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/src/core/Value.cc b/src/core/Value.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <utility>
 #include <cstdint>
 #include <cassert>

diff --git a/src/core/customizer/Annotation.cc b/src/core/customizer/Annotation.cc
@@ -27,6 +27,7 @@
 
 #include "core/customizer/Annotation.h"
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <utility>

diff --git a/src/core/customizer/Annotation.h b/src/core/customizer/Annotation.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/src/core/function.cc b/src/core/function.cc
@@ -28,6 +28,7 @@
 #include "core/Expression.h"
 #include "core/function.h"
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <utility>

diff --git a/src/core/function.h b/src/core/function.h
@@ -5,6 +5,7 @@
 #include "Feature.h"
 #include "core/Value.h"
 
+#include <ostream>
 #include <memory>
 #include <functional>
 #include <string>

diff --git a/src/core/node.h b/src/core/node.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <utility>

diff --git a/src/geometry/Geometry.cc b/src/geometry/Geometry.cc
@@ -1,5 +1,6 @@
 #include "geometry/Geometry.h"
 #include "utils/printutils.h"
+#include <sstream>
 #include <memory>
 #include <boost/foreach.hpp>
 #include <cstddef>

diff --git a/src/geometry/PolySet.cc b/src/geometry/PolySet.cc
@@ -29,6 +29,7 @@
 #include "geometry/linalg.h"
 #include "utils/printutils.h"
 #include "geometry/Grid.h"
+#include <sstream>
 #include <memory>
 #include <Eigen/LU>
 #include <cstddef>

diff --git a/src/geometry/Polygon2d.cc b/src/geometry/Polygon2d.cc
@@ -1,5 +1,6 @@
 #include "geometry/Polygon2d.h"
 
+#include <sstream>
 #include <utility>
 #include <cstddef>
 #include <string>

diff --git a/src/geometry/cgal/cgalutils-coplanar-faces-remesher.h b/src/geometry/cgal/cgalutils-coplanar-faces-remesher.h
@@ -1,6 +1,7 @@
 // Portions of this file are Copyright 2021 Google LLC, and licensed under GPL2+. See COPYING.
 #pragma once
 
+#include <iostream>
 #include <CGAL/Surface_mesh.h>
 #include <cstddef>
 #include <unordered_map>

diff --git a/src/geometry/cgal/cgalutils-polyhedron.cc b/src/geometry/cgal/cgalutils-polyhedron.cc
@@ -6,6 +6,7 @@
 #include "utils/printutils.h"
 #include "geometry/Grid.h"
 
+#include <ostream>
 #include <memory>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 

diff --git a/src/geometry/manifold/ManifoldGeometry.cc b/src/geometry/manifold/ManifoldGeometry.cc
@@ -1,6 +1,7 @@
 // Portions of this file are Copyright 2023 Google LLC, and licensed under GPL2+. See COPYING.
 #include "geometry/manifold/ManifoldGeometry.h"
 #include "geometry/Polygon2d.h"
+#include <sstream>
 #include <utility>
 #include <cstdint>
 #include <manifold/cross_section.h>

diff --git a/src/geometry/roof_vd.cc b/src/geometry/roof_vd.cc
@@ -1,6 +1,7 @@
 // This file is a part of openscad. Everything implied is implied.
 // Author: Alexey Korepanov <[email protected]>
 
+#include <ostream>
 #include <cstdint>
 #include <memory>
 

diff --git a/src/glview/OffscreenContextCGL.cc b/src/glview/OffscreenContextCGL.cc
@@ -1,5 +1,6 @@
 #include "glview/OffscreenContextCGL.h"
 
+#include <sstream>
 #include <memory>
 #include <cstddef>
 #include <string>

diff --git a/src/glview/OffscreenView.cc b/src/glview/OffscreenView.cc
@@ -1,5 +1,6 @@
 #include "glview/OffscreenView.h"
 #include "glview/system-gl.h"
+#include <iostream>
 #include <cstdint>
 #include <cmath>
 #include <cstdio>

diff --git a/src/glview/Renderer.cc b/src/glview/Renderer.cc
@@ -6,6 +6,7 @@
 #include "platform/PlatformUtils.h"
 #include "glview/system-gl.h"
 
+#include <sstream>
 #include <Eigen/LU>
 #include <fstream>
 #include <string>

diff --git a/src/glview/offscreen-old/OffscreenContextEGL.cc b/src/glview/offscreen-old/OffscreenContextEGL.cc
@@ -25,6 +25,7 @@
  */
 #include "glview/offscreen-old/OffscreenContextEGL.h"
 
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <EGL/egl.h>

diff --git a/src/glview/offscreen-old/OffscreenContextGLX.cc b/src/glview/offscreen-old/OffscreenContextGLX.cc
@@ -38,6 +38,7 @@
 
 
 #include "glview/system-gl.h"
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <GL/gl.h>

diff --git a/src/glview/offscreen-old/OffscreenContextWGL.cc b/src/glview/offscreen-old/OffscreenContextWGL.cc
@@ -13,6 +13,7 @@
 #include "glview/offscreen-old/OffscreenContextWGL.h"
 
 #undef NOGDI
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <windows.h>

diff --git a/src/gui/Animate.cc b/src/gui/Animate.cc
@@ -1,6 +1,7 @@
 #include "gui/Animate.h"
 #include "utils/printutils.h"
 #include "gui/MainWindow.h"
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <QFormLayout>
 

diff --git a/src/gui/MainWindow.cc b/src/gui/MainWindow.cc
@@ -23,6 +23,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#include <sstream>
 #include <iostream>
 #include <memory>
 #include <string>

diff --git a/src/gui/Measurement.cc b/src/gui/Measurement.cc
@@ -26,6 +26,7 @@
 
 #include "gui/Measurement.h"
 
+#include <sstream>
 #include <string>
 
 Measurement::Measurement()

diff --git a/src/gui/QGLView.cc b/src/gui/QGLView.cc
@@ -33,6 +33,7 @@
 #include "glview/glew-utils.h"
 #endif
 
+#include <iostream>
 #include <QApplication>
 #include <QWheelEvent>
 #include <QCheckBox>

diff --git a/src/gui/ViewportControl.cc b/src/gui/ViewportControl.cc
@@ -2,6 +2,7 @@
 #include "utils/printutils.h"
 #include "gui/MainWindow.h"
 #include "gui/QGLView.h"
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <cfloat>
 #include <QDoubleSpinBox>

diff --git a/src/gui/input/HidApiInputDriver.cc b/src/gui/input/HidApiInputDriver.cc
@@ -29,6 +29,8 @@
  *  Public Domain.
  */
 
+#include <ios>
+#include <sstream>
 #include <cstdint>
 #include <bitset>
 #include <boost/format.hpp>

diff --git a/src/gui/input/InputDriverManager.cc b/src/gui/input/InputDriverManager.cc
@@ -26,6 +26,7 @@
 #include "gui/input/InputDriverEvent.h"
 #include "gui/input/InputDriverManager.h"
 #include "gui/MainWindow.h"
+#include <sstream>
 #include <QAction>
 #include <QMenu>
 #include <QApplication>

diff --git a/src/handle_dep.cc b/src/handle_dep.cc
@@ -1,5 +1,6 @@
 #include "handle_dep.h"
 #include "utils/printutils.h"
+#include <iostream>
 #include <string>
 #include <sstream>
 #include <cstdlib> // for system()

diff --git a/src/io/export.cc b/src/io/export.cc
@@ -29,6 +29,7 @@
 #include "utils/printutils.h"
 #include "geometry/Geometry.h"
 
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <cstddef>

diff --git a/src/io/export_3mf_v1.cc b/src/io/export_3mf_v1.cc
@@ -36,6 +36,7 @@
 #include "geometry/manifold/ManifoldGeometry.h"
 #endif
 
+#include <ostream>
 #include <cstdint>
 #include <memory>
 #include <string>

diff --git a/src/io/export_3mf_v2.cc b/src/io/export_3mf_v2.cc
@@ -36,6 +36,7 @@
 #include "geometry/manifold/ManifoldGeometry.h"
 #endif
 
+#include <ostream>
 #include <utility>
 #include <cstdint>
 #include <memory>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ @@
      *
      */
+    #include <ostream>
     #include <memory>
     #include <vector>
@@ Expand Down @@