Merge branch 'sdf15' into model-get-mutable

gazebosim · Jan 3, 2025 · 6a4b430 · 6a4b430
2 parents 049a36f + a6cc2af
commit 6a4b430
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/include/sdf/Error.hh b/include/sdf/Error.hh
@@ -17,9 +17,9 @@
 #ifndef SDF_ERROR_HH_
 #define SDF_ERROR_HH_
 
-#include <iostream>
-#include <string>
 #include <optional>
+#include <ostream>
+#include <string>
 #include <gz/utils/ImplPtr.hh>
 #include <sdf/config.hh>
 #include "sdf/Console.hh"

diff --git a/include/sdf/Exception.hh b/include/sdf/Exception.hh
@@ -19,8 +19,8 @@
 #define SDF_EXCEPTION_HH_
 
 #include <cstdint>
-#include <iostream>
 #include <memory>
+#include <ostream>
 #include <sstream>
 #include <string>
 

diff --git a/src/Console.cc b/src/Console.cc
@@ -16,6 +16,7 @@
  */
 
 #include <cstdlib>
+#include <iostream>
 #include <memory>
 #include <mutex>
 #include <sstream>

diff --git a/src/Element.cc b/src/Element.cc
@@ -16,6 +16,7 @@
  */
 
 #include <algorithm>
+#include <iostream>
 #include <sstream>
 #include <string>
 

diff --git a/src/FrameSemantics.cc b/src/FrameSemantics.cc
@@ -15,6 +15,7 @@
  *
 */
 #include <algorithm>
+#include <iostream>
 #include <string>
 #include <set>
 #include <utility>

diff --git a/src/SDF.cc b/src/SDF.cc
@@ -17,10 +17,11 @@
 
 #include <cstdlib>
 #include <fstream>
-#include <sstream>
 #include <functional>
+#include <iostream>
 #include <list>
 #include <map>
+#include <sstream>
 #include <string>
 #include <vector>