Merge ../Arduino-Helpers

tttapa · Sep 3, 2023 · f6723db · f6723db
2 parents bccc4d0 + 0de827b
commit f6723db
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/AH/PrintStream/PrintStream.hpp b/src/AH/PrintStream/PrintStream.hpp
@@ -84,11 +84,15 @@ Print &operator<<(Print &p, HexDump h);
 
 /// @}
 
+END_AH_NAMESPACE
+
 #ifndef ARDUINO
 
 #include <iomanip>
 #include <iostream>
 
+BEGIN_AH_NAMESPACE
+
 // TODO: check conflicts between Arduino version and C++ STL version
 using std::endl;
 // using std::setbase;
@@ -116,10 +120,10 @@ inline std::ostream &operator<<(std::ostream &os,
 
 std::ostream &operator<<(std::ostream &p, HexDump h);
 
-#endif
-
 END_AH_NAMESPACE
 
+#endif
+
 AH_DIAGNOSTIC_POP()
 
 #include <Settings/NamespaceSettings.hpp>