Remove template parameter from ScopedStreamModifiers

And rename it from BasicStreamModifiers to ScopedStreamModifiers.

Author: trflynn89

bench/util/table.hpp

@@ -231,7 +231,7 @@ void Table<Args...>::append_row(Args... args)
 template <class... Args>
 void Table<Args...>::print_table(std::ostream &stream) const
 {
-    fly::detail::BasicStreamModifiers<std::string> scoped_modifiers(stream);
+    fly::detail::ScopedStreamModifiers scoped_modifiers(stream);
     scoped_modifiers.locale<CommaPunctuation>();
 
     // Compute the entire width of the table. There are 1 + the number of columns vertical

fly/types/string/detail/stream_util.hpp

@@ -16,21 +16,20 @@ namespace fly::detail {
  * @author Timothy Flynn ([email protected])
  * @version January 3, 2021
  */
-template <typename StringType>
-class BasicStreamModifiers
+class ScopedStreamModifiers
 {
 public:
     /**
      * Constructor. Store the stream's current state to be restored upon destruction.
      *
      * @param stream The stream to be modified.
      */
-    explicit BasicStreamModifiers(std::ostream &stream) noexcept;
+    explicit ScopedStreamModifiers(std::ostream &stream) noexcept;
 
     /**
      * Destructor. Restore the stream's orginal state.
      */
-    ~BasicStreamModifiers();
+    ~ScopedStreamModifiers();
 
     /**
      * Sets a formatting flag on the stream.
@@ -77,8 +76,8 @@ class BasicStreamModifiers
     void precision(std::streamsize size);
 
 private:
-    BasicStreamModifiers(const BasicStreamModifiers &) = delete;
-    BasicStreamModifiers &operator=(const BasicStreamModifiers &) = delete;
+    ScopedStreamModifiers(const ScopedStreamModifiers &) = delete;
+    ScopedStreamModifiers &operator=(const ScopedStreamModifiers &) = delete;
 
     std::ostream &m_stream;
 
@@ -119,8 +118,7 @@ class PositivePaddingFacet : public std::ctype<CharType>
 };
 
 //==================================================================================================
-template <typename StringType>
-BasicStreamModifiers<StringType>::BasicStreamModifiers(std::ostream &stream) noexcept :
+inline ScopedStreamModifiers::ScopedStreamModifiers(std::ostream &stream) noexcept :
     m_stream(stream),
     m_flags(stream.flags()),
     m_locale(stream.getloc()),
@@ -131,8 +129,7 @@ BasicStreamModifiers<StringType>::BasicStreamModifiers(std::ostream &stream) noe
 }
 
 //==================================================================================================
-template <typename StringType>
-BasicStreamModifiers<StringType>::~BasicStreamModifiers()
+inline ScopedStreamModifiers::~ScopedStreamModifiers()
 {
     if (m_changed_flags)
     {
@@ -157,50 +154,43 @@ BasicStreamModifiers<StringType>::~BasicStreamModifiers()
 }
 
 //==================================================================================================
-template <typename StringType>
-inline void BasicStreamModifiers<StringType>::setf(std::ios_base::fmtflags flag)
+inline void ScopedStreamModifiers::setf(std::ios_base::fmtflags flag)
 {
     m_stream.setf(flag);
     m_changed_flags = true;
 }
 
 //==================================================================================================
-template <typename StringType>
-inline void
-BasicStreamModifiers<StringType>::setf(std::ios_base::fmtflags flag, std::ios_base::fmtflags mask)
+inline void ScopedStreamModifiers::setf(std::ios_base::fmtflags flag, std::ios_base::fmtflags mask)
 {
     m_stream.setf(flag, mask);
     m_changed_flags = true;
 }
 
 //==================================================================================================
-template <typename StringType>
 template <typename Facet>
-inline void BasicStreamModifiers<StringType>::locale()
+inline void ScopedStreamModifiers::locale()
 {
     m_stream.imbue({m_stream.getloc(), new Facet()});
     m_changed_locale = true;
 }
 
 //==================================================================================================
-template <typename StringType>
-inline void BasicStreamModifiers<StringType>::fill(char ch)
+inline void ScopedStreamModifiers::fill(char ch)
 {
     m_stream.fill(ch);
     m_changed_fill = true;
 }
 
 //==================================================================================================
-template <typename StringType>
-inline void BasicStreamModifiers<StringType>::width(std::streamsize size)
+inline void ScopedStreamModifiers::width(std::streamsize size)
 {
     m_stream.width(size);
     m_changed_width = true;
 }
 
 //==================================================================================================
-template <typename StringType>
-inline void BasicStreamModifiers<StringType>::precision(std::streamsize size)
+inline void ScopedStreamModifiers::precision(std::streamsize size)
 {
     m_stream.precision(size);
     m_changed_precision = true;

fly/types/string/string_formatters.hpp

@@ -219,7 +219,6 @@ struct Formatter<T, CharType, fly::enable_if<std::is_floating_point<T>>>
 
 private:
     using string_type = std::basic_string<CharType>;
-    using stream_modifiers = detail::BasicStreamModifiers<string_type>;
     using specifier = detail::BasicFormatSpecifier<CharType>;
 
     static constexpr const auto s_zero = FLY_CHR(CharType, '0');
@@ -646,7 +645,7 @@ void Formatter<T, CharType, fly::enable_if<std::is_floating_point<T>>>::format(
     FormatContext &context)
 {
     static thread_local std::stringstream s_stream;
-    stream_modifiers modifiers(s_stream);
+    detail::ScopedStreamModifiers modifiers(s_stream);
 
     if (context.spec().m_alignment == specifier::Alignment::Default)
     {