CArchive: remove overloads for CStdString as redundant (handled by std::string)

2 files changed, 0 insertions, 38 deletions

diff --git a/xbmc/utils/Archive.cpp b/xbmc/utils/Archive.cpp
index 122c41b0c2..a857ded260 100644
--- a/xbmc/utils/Archive.cpp
+++ b/xbmc/utils/Archive.cpp
@@ -179,30 +179,6 @@ CArchive& CArchive::operator<<(const std::string& str)
   return *this;
 }
 
-CArchive& CArchive::operator<<(const CStdString& str)
-{
-  *this << (unsigned int)str.size();
-
-  int size = str.size();
-  if (m_BufferPos + size >= BUFFER_MAX)
-    FlushBuffer();
-
-  int iBufferMaxParts=size/BUFFER_MAX;
-  for (int i=0; i<iBufferMaxParts; i++)
-  {
-    memcpy(&m_pBuffer[m_BufferPos], str.c_str()+(i*BUFFER_MAX), BUFFER_MAX);
-    m_BufferPos+=BUFFER_MAX;
-    FlushBuffer();
-  }
-
-  int iPos=iBufferMaxParts*BUFFER_MAX;
-  int iSizeLeft=size-iPos;
-  memcpy(&m_pBuffer[m_BufferPos], str.c_str()+iPos, iSizeLeft);
-  m_BufferPos+=iSizeLeft;
-
-  return *this;
-}
-
 CArchive& CArchive::operator<<(const CStdStringW& str)
 {
   *this << (unsigned int)str.size();
@@ -375,18 +351,6 @@ CArchive& CArchive::operator>>(std::string& str)
   return *this;
 }
 
-CArchive& CArchive::operator>>(CStdString& str)
-{
-  unsigned int iLength = 0;
-  *this >> iLength;
-
-  m_pFile->Read((void*)str.GetBufferSetLength(iLength), iLength);
-  str.ReleaseBuffer();
-
-
-  return *this;
-}
-
 CArchive& CArchive::operator>>(CStdStringW& str)
 {
   unsigned int iLength = 0;
diff --git a/xbmc/utils/Archive.h b/xbmc/utils/Archive.h
index 97937c0a25..df8e1ff510 100644
--- a/xbmc/utils/Archive.h
+++ b/xbmc/utils/Archive.h
@@ -53,7 +53,6 @@ public:
   CArchive& operator<<(bool b);
   CArchive& operator<<(char c);
   CArchive& operator<<(const std::string &str);
-  CArchive& operator<<(const CStdString& str);
   CArchive& operator<<(const CStdStringW& str);
   CArchive& operator<<(const SYSTEMTIME& time);
   CArchive& operator<<(IArchivable& obj);
@@ -71,7 +70,6 @@ public:
   CArchive& operator>>(bool& b);
   CArchive& operator>>(char& c);
   CArchive& operator>>(std::string &str);
-  CArchive& operator>>(CStdString& str);
   CArchive& operator>>(CStdStringW& str);
   CArchive& operator>>(SYSTEMTIME& time);
   CArchive& operator>>(IArchivable& obj);