[Libreoffice-commits] core.git: include/rtl

[Mike Kaganski (via logerrit)]

 include/rtl/string.hxx  |    4 ----
 include/rtl/ustring.hxx |    4 ----
 2 files changed, 8 deletions(-)

New commits:
commit 40f67c9002d4cc245cd2c24981fd3af7910485a1
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Nov 29 11:08:34 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Nov 29 21:41:58 2019 +0100

    Enable O[U]String move ctor/assignment for Win
    
    Change-Id: If7ad38a7a802732e84db9352a475644327769d62
    Reviewed-on: https://gerrit.libreoffice.org/84043
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index acfe7d586405..809b0a11bcd5 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -121,7 +121,6 @@ public:
         rtl_string_acquire( pData );
     }
 
-#ifndef _MSC_VER // TODO?
 #if defined LIBO_INTERNAL_ONLY
     /**
       Move constructor.
@@ -136,7 +135,6 @@ public:
         rtl_string_new( &str.pData );
     }
 #endif
-#endif
 
     /**
       New string from OString data.
@@ -314,7 +312,6 @@ public:
         return *this;
     }
 
-#ifndef _MSC_VER // TODO?
 #if defined LIBO_INTERNAL_ONLY
     /**
       Move assign a new string.
@@ -331,7 +328,6 @@ public:
         return *this;
     }
 #endif
-#endif
 
     /**
      @overload
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index f648cddce1d8..5919e3de6371 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -150,7 +150,6 @@ public:
         rtl_uString_acquire( pData );
     }
 
-#ifndef _MSC_VER // TODO?
 #if defined LIBO_INTERNAL_ONLY
     /**
       Move constructor.
@@ -165,7 +164,6 @@ public:
         rtl_uString_new( &str.pData );
     }
 #endif
-#endif
 
     /**
       New string from OUString data.
@@ -463,7 +461,6 @@ public:
         return *this;
     }
 
-#ifndef _MSC_VER // TODO?
 #if defined LIBO_INTERNAL_ONLY
     /**
       Move assign a new string.
@@ -480,7 +477,6 @@ public:
         return *this;
     }
 #endif
-#endif
 
     /**
       Assign a new string from an 8-Bit string literal that is expected to contain only