Changeset 96354 in vbox

Timestamp:

Aug 19, 2022 5:37:29 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Defined cout and cerr; implemented ostream::flush and fixed a compile issue. bugref:10261

Location:

trunk

Files:

• include/iprt/nocrt/ios (modified) (1 diff)
• include/iprt/nocrt/ostream (modified) (4 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/r3/nocrt-cerr.cpp (added)
• src/VBox/Runtime/r3/nocrt-cout.cpp (added)

trunk/include/iprt/nocrt/ios

@@ -358 +358 @@
                 if (cchCopied > 0)
                 {
-                    cchCopied = RT_MIN(cchCopied, a_cchSrc);
+                    cchCopied = RT_MIN(cchCopied, static_cast<std::size_t>(a_cchSrc));
                     traits_type::copy(&m_pachPut[m_offPutNext], a_pchSrc, cchCopied);
                     m_cchPut += cchCopied;

trunk/include/iprt/nocrt/ostream

@@ -83 +83 @@
             : basic_ios(a_pBuf)
         { }
+
+        /** For cerr initialization.
+         * @internal */
+        explicit basic_ostream(std::basic_streambuf<a_CharType,a_CharTraits> *a_pBuf,
+                               std::basic_ostream<a_CharType, a_CharTraits> *a_pTiedStream,
+                               bool a_fUnbuffered)
+            : basic_ios(a_pBuf)
+        {
+            m_pTiedStream = a_pTiedStream;
+            if (!a_fUnbuffered)
+                setf(std::ios_base::unitbuf);
+        }
+
     private:
         basic_ostream(basic_ostream const &a_rSrc);             /* not copyable */
@@ -116 +129 @@
         }
 
-        basic_ostream &flush();
+        basic_ostream &flush()
+        {
+            if (m_pBuf)
+                m_pBuf->pubsync();
+            return *this;
+        }
+
         pos_type       tellp() RT_NOEXCEPT;
         basic_ostream &seekp(pos_type a_off) RT_NOEXCEPT;
@@ -123 +142 @@
         /** @name Internal support methods
          * @{ */
-        basic_ostream &intWrite(const char *a_pchSrc, std::streamsize a_cchToWrite); /**< Internal method outputting char buffers. */
+        inline basic_ostream &intWrite(const char *a_pchSrc, std::streamsize a_cchToWrite); /**< Internal method outputting char buffers. */
 
         /** @returns 8, 10 or 16. */
@@ -240 +259 @@
 
     template<>
-    basic_ostream<char> &basic_ostream<char>::intWrite(const char *a_pchSrc, std::streamsize a_cchToWrite)
+    inline basic_ostream<char> &basic_ostream<char>::intWrite(const char *a_pchSrc, std::streamsize a_cchToWrite)
     {
         return write(a_pchSrc, a_cchToWrite);

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1903 +1903 @@
         r3/nocrt-clearerr.cpp \
         r3/nocrt-ferror.cpp \
+        r3/nocrt-cerr.cpp \
+        r3/nocrt-cout.cpp \
 
   RuntimeR3_SOURCES.x86 = $(RuntimeBaseR3_SOURCES.x86) \