More conversion of internals to std::format style, bit by bit

There's no rhyme or reason to this particular set of changes... I just picked a few files and did the obvious conversion. Will do more in subsequent PRs. Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · May 2, 2022 · 32b1e53 · 32b1e53
1 parent b7a8728
commit 32b1e53
Show file tree

Hide file tree

Showing 10 changed files with 222 additions and 312 deletions.
diff --git a/src/liboslcomp/ast.h b/src/liboslcomp/ast.h
@@ -201,37 +201,6 @@ class ASTNode : public OIIO::RefCnt {
 
     void sourceline(int line) { m_sourceline = line; }
 
-    template<typename... Args>
-    void errorf(const char* format, const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        error_impl(OIIO::Strutil::sprintf(format, args...));
-    }
-
-    /// Warning reporting
-    template<typename... Args>
-    void warningf(const char* format, const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        warning_impl(OIIO::Strutil::sprintf(format, args...));
-    }
-
-    /// info reporting
-    template<typename... Args>
-    void infof(const char* format, const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        info_impl(OIIO::Strutil::sprintf(format, args...));
-    }
-
-    /// message reporting
-    template<typename... Args>
-    void messagef(const char* format, const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        message_impl(OIIO::Strutil::sprintf(format, args...));
-    }
-
     template<typename... Args>
     void errorfmt(const char* format, const Args&... args) const
     {

diff --git a/src/liboslcomp/oslcomp_pvt.h b/src/liboslcomp/oslcomp_pvt.h
@@ -75,77 +75,6 @@ class OSLCompilerImpl {
 
     ErrorHandler& errhandler() const { return *m_errhandler; }
 
-    /// Error reporting
-    template<typename... Args>
-    OIIO_DEPRECATED("use errorfmt")
-    void errorf(ustring filename, int line, const char* format,
-                const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        std::string msg = OIIO::Strutil::sprintf(format, args...);
-        if (msg.size() && msg.back() == '\n')  // trim extra newline
-            msg.pop_back();
-        if (filename.size())
-            m_errhandler->errorfmt("{}:{}: error: {}", filename, line, msg);
-        else
-            m_errhandler->errorfmt("error: {}", msg);
-        m_err = true;
-    }
-
-    /// Warning reporting
-    template<typename... Args>
-    OIIO_DEPRECATED("use warningfmt")
-    void warningf(ustring filename, int line, const char* format,
-                  const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        if (nowarn(filename, line))
-            return;  // skip if the filename/line is on the nowarn list
-        std::string msg = OIIO::Strutil::sprintf(format, args...);
-        if (msg.size() && msg.back() == '\n')  // trim extra newline
-            msg.pop_back();
-        if (m_err_on_warning) {
-            errorfmt(filename, line, "{}", msg);
-            return;
-        }
-        if (filename.size())
-            m_errhandler->warningfmt("{}:{}: warning: {}", filename, line, msg);
-        else
-            m_errhandler->warningfmt("warning: {}", msg);
-    }
-
-    /// Info reporting
-    template<typename... Args>
-    OIIO_DEPRECATED("use infofmt")
-    void infof(ustring filename, int line, const char* format,
-               const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        std::string msg = OIIO::Strutil::sprintf(format, args...);
-        if (msg.size() && msg.back() == '\n')  // trim extra newline
-            msg.pop_back();
-        if (filename.size())
-            m_errhandler->infofmt("{}:{}: info: {}", filename, line, msg);
-        else
-            m_errhandler->infofmt("info: {}", msg);
-    }
-
-    /// message reporting
-    template<typename... Args>
-    OIIO_DEPRECATED("use messagef")
-    void messagef(ustring filename, int line, const char* format,
-                  const Args&... args) const
-    {
-        OSL_DASSERT(format && format[0]);
-        std::string msg = OIIO::Strutil::sprintf(format, args...);
-        if (msg.size() && msg.back() == '\n')  // trim extra newline
-            msg.pop_back();
-        if (filename.size())
-            m_errhandler->messagefmt("{}:{}: {}", filename, line, msg);
-        else
-            m_errhandler->messagefmt("{}", msg);
-    }
-
     /// Error reporting
     template<typename... Args>
     void errorfmt(ustring filename, int line, const char* format,