Changeset 99828 in vbox for trunk/include/iprt

Timestamp:

May 17, 2023 1:48:57 PM (22 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157464

Message:

*: A bunch of adjustments that allows using /permissive- with Visual C++ (qt 6.x necessity).

Location:

trunk/include/iprt/nocrt

Files:

• fstream (modified) (4 diffs)
• ios (modified) (2 diffs)
• ostream (modified) (9 diffs)
• string (modified) (2 diffs)

trunk/include/iprt/nocrt/fstream

@@ -56 +56 @@
     public:
         basic_filebuf(PRTSTREAM a_pStrm = NULL, bool a_fStdStream = false)
-            : basic_streambuf()
+            : basic_streambuf<a_CharType, a_CharTraits>()
             , m_pStrm(a_pStrm)
             , m_fStdStream(a_fStdStream)
@@ -142 +142 @@
         //}
 
-        std::streamsize xsputn(char_type const *a_pchSrc, std::streamsize a_cchSrc) //RT_OVERRIDE
+        std::streamsize xsputn(typename basic_streambuf<a_CharType, a_CharTraits>::char_type const *a_pchSrc,
+                               std::streamsize a_cchSrc) //RT_OVERRIDE
         {
             if (flushBuffered())
@@ -167 +168 @@
     public:
         basic_ofstream()
-            : basic_ostream(&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */
+            : basic_ostream<a_CharType, a_CharTraits>(&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */
             , m_FileBuf()
         {
@@ -173 +174 @@
 
         explicit basic_ofstream(const char *a_pszFilename, ios_base::openmode a_fMode = ios_base::out)
-            : basic_ostream(&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */
+            : basic_ostream<a_CharType, a_CharTraits>(&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */
             , m_FileBuf()
         {

trunk/include/iprt/nocrt/ios

@@ -266 +266 @@
         char_type *epptr()  const RT_NOEXCEPT
         {
-            return &m_pachBuf[m_cchPut];
+            return &m_pachPut[m_cchPut];
         }
 
@@ -498 +498 @@
         }
 
-        std::basic_streambuf<a_CharType, a_CharTraits> *rdbuf(std::basic_streambuf<a_CharType, a_CharTraits> *a_pNewbuf) RT_NOEXCEPT
+        std::basic_streambuf<a_CharType, a_CharTraits> *rdbuf(std::basic_streambuf<a_CharType, a_CharTraits> *a_pNewBuf) RT_NOEXCEPT
         {
             std::basic_streambuf<a_CharType, a_CharTraits> *pOldBuf = m_pBuf;

trunk/include/iprt/nocrt/ostream

@@ -51 +51 @@
     class basic_ostream : public basic_ios<a_CharType, a_CharTraits>
     {
+    public:
+        typedef a_CharType                          char_type;
+        typedef a_CharTraits                        traits_type;
+        typedef typename a_CharTraits::int_type     int_type;
+        typedef typename a_CharTraits::pos_type     pos_type;
+        typedef typename a_CharTraits::off_type     off_type;
+
     protected:
         /** Sentry class that performs pre and post output work. */
@@ -71 +78 @@
                         pTiedStream->flush();
                         if (!pTiedStream->good())
-                            a_rParent.setstate(failbit);
+                            a_rParent.setstate(ios::failbit);
                     }
                 }
@@ -91 +98 @@
     public:
         explicit basic_ostream(std::basic_streambuf<a_CharType,a_CharTraits> *a_pBuf)
-            : basic_ios(a_pBuf)
+            : basic_ios<a_CharType, a_CharTraits>(a_pBuf)
         { }
 
@@ -99 +106 @@
                                std::basic_ostream<a_CharType, a_CharTraits> *a_pTiedStream,
                                bool a_fUnbuffered)
-            : basic_ios(a_pBuf)
-        {
-            m_pTiedStream = a_pTiedStream;
+            : basic_ios<a_CharType, a_CharTraits>(a_pBuf)
+        {
+            this->m_pTiedStream = a_pTiedStream;
             if (!a_fUnbuffered)
-                setf(std::ios_base::unitbuf);
+                this->setf(std::ios_base::unitbuf);
         }
 
@@ -116 +123 @@
 
     public:
-        basic_ostream &put(char_type a_ch)
+        basic_ostream &put(a_CharType a_ch)
         {
             sentry PrePost(*this);
             if (PrePost)
             {
-                if (m_pBuf->sputc(a_ch) == traits_type::eof())
-                    m_fState |= badbit;
+                if (this->m_pBuf->sputc(a_ch) == traits_type::eof())
+                    this->m_fState |= ios::badbit;
             }
             return *this;
         }
 
-        basic_ostream &write(const char_type *a_pchSrc, std::streamsize a_cchToWrite)
+        basic_ostream &write(const a_CharType *a_pchSrc, std::streamsize a_cchToWrite)
         {
             sentry PrePost(*this);
             if (PrePost)
             {
-                std::streamsize cchWritten = m_pBuf->sputn(a_pchSrc, a_cchToWrite);
+                std::streamsize cchWritten = this->m_pBuf->sputn(a_pchSrc, a_cchToWrite);
                 if (cchWritten != a_cchToWrite)
-                    m_fState |= badbit;
+                    this->m_fState |= ios::badbit;
             }
             return *this;
@@ -141 +148 @@
         basic_ostream &flush()
         {
-            if (m_pBuf)
-                m_pBuf->pubsync();
+            if (this->m_pBuf)
+                this->m_pBuf->pubsync();
             return *this;
         }
@@ -148 +155 @@
         pos_type       tellp() RT_NOEXCEPT;
         basic_ostream &seekp(pos_type a_off) RT_NOEXCEPT;
-        basic_ostream &seekp(off_type a_off, seekdir enmDir) RT_NOEXCEPT;
+        basic_ostream &seekp(off_type a_off, ios::seekdir enmDir) RT_NOEXCEPT;
 
         /** @name Internal support methods
@@ -157 +164 @@
         inline unsigned intGetIntegerBase() const RT_NOEXCEPT
         {
-            switch (m_fFlags & basefield)
+            switch (this->m_fFlags & ios::basefield)
             {
                 default:
-                case dec: return 10;
-                case hex: return 16;
-                case oct: return 8;
+                case ios::dec: return 10;
+                case ios::hex: return 16;
+                case ios::oct: return 8;
             }
         }
@@ -170 +177 @@
         {
             unsigned fFlags = 0;
-            if (m_fFlags & uppercase)
+            if (this->m_fFlags & ios::uppercase)
                 fFlags |= RTSTR_F_CAPITAL;
-            if (m_fFlags & showbase)
+            if (this->m_fFlags & ios::showbase)
                 fFlags |= RTSTR_F_SPECIAL;
-            if (m_fFlags & showpos)
+            if (this->m_fFlags & ios::showpos)
                 fFlags |= RTSTR_F_PLUS;
             return fFlags;

trunk/include/iprt/nocrt/string

@@ -158 +158 @@
     {
         const char_type * const pszStart = a_psz;
-        while (!eq(*a_pszLeft, char_type()))
+        while (!eq(*a_psz, char_type()))
                a_psz++;
         return static_cast<std::size_t>(a_psz - pszStart);
@@ -216 +216 @@
         char_type volatile       *pchDstV = static_cast<char_type const volatile *>(a_pchDst);
         char_type const volatile *pchSrcV = static_cast<char_type const volatile *>(a_pchSrc);
-        if ((uintptr_t)a_pchDst < (uintptr_t)a_pchSrc)
+        if ((uintptr_t)pchDstV < (uintptr_t)pchSrcV)
         {
             /* forward copy */
             while (a_cch-- > 0)
-                *a_pchDstV++ = *a_pchSrcV++;
+                *pchDstV++ = *pchSrcV++;
         }
         else
         {
             /* reverse copy */
-            a_pchSrcV += a_cch;
-            a_pchDstV += a_cch;
-            while (a_cchDst-- > 0)
-                *a_pchDstV-- = *a_pchSrcV--;
+            pchSrcV += a_cch;
+            pchDstV += a_cch;
+            while (a_cch-- > 0)
+                *pchDstV-- = *pchSrcV--;
         }
         return pchRet;