Removed ostringstream use. Fixed C++03 problem with Ensure declaration

Haivision · May 27, 2024 · 216c1ed · 216c1ed
1 parent 8126c49
commit 216c1ed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/apps/logsupport.cpp b/apps/logsupport.cpp
@@ -173,7 +173,7 @@ set<srt_logging::LogFA> SrtParseLogFA(string fa, set<string>* punknown)
 
 void ParseLogFASpec(const vector<string>& speclist, string& w_on, string& w_off)
 {
-    std::ostringstream son, soff;
+    fmt::obufstream son, soff;
 
     for (auto& s: speclist)
     {

diff --git a/apps/uriparser.cpp b/apps/uriparser.cpp
@@ -64,7 +64,7 @@ string UriParser::makeUri()
         prefix = m_proto + "://";
     }
 
-    std::ostringstream out;
+    fmt::obufstream out;
 
     out << prefix << m_host;
     if ((m_port == "" || m_port == "0") && m_expect == EXPECT_FILE)

diff --git a/srtcore/sfmt.h b/srtcore/sfmt.h
@@ -242,7 +242,11 @@ struct Ensure
 template<class AnyType>
 struct Ensure<AnyType, false>
 {
-    typename AnyType::wrong_condition v = AnyType::wrong_condition;
+    static void CheckIfCharsetNonEmpty()
+    {
+        typename AnyType::wrong_condition v = AnyType::wrong_condition;
+        (void)v;
+    }
 };
 
 template<size_t N1, size_t N2, size_t N3> inline

diff --git a/srtcore/utilities.h b/srtcore/utilities.h
@@ -531,8 +531,8 @@ struct explicit_t
 // but this function has a different definition for C++11 and C++03.
 namespace srt_pair_op
 {
-    template <class Value1, class Value2>
-    std::ostream& operator<<(std::ostream& s, const std::pair<Value1, Value2>& v)
+    template <class Stream, class Value1, class Value2>
+    Stream& operator<<(Stream& s, const std::pair<Value1, Value2>& v)
     {
         s << "{" << v.first << " " << v.second << "}";
         return s;