Support/ADT: Move c_str() from SmallString to SmallVectorImpl. The Windows PathV2

implementation needs it for wchar_t and SmallVectorImpl in general.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120984 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/SmallString.h b/include/llvm/ADT/SmallString.h
index 05bd8a42c67f650c967e3212298deb3dda111b9a..7328560822194b3d1504b060104874609a1a140f 100644 (file)
--- a/include/llvm/ADT/SmallString.h
+++ b/include/llvm/ADT/SmallString.h
@@ -41,12 +41,6 @@ public:
   // Implicit conversion to StringRef.
   operator StringRef() const { return str(); }
 
-  const char *c_str() {
-    this->push_back(0);
-    this->pop_back();
-    return this->data();
-  }
-
   // Extra operators.
   const SmallString &operator=(StringRef RHS) {
     this->clear();

diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h
index 0c9f7eb6345944a9b6414aa335a08912048a644f..123b85daff84f178fa0409553a8e82656da0f4d9 100644 (file)
--- a/include/llvm/ADT/SmallVector.h
+++ b/include/llvm/ADT/SmallVector.h
@@ -340,6 +340,12 @@ public:
     return Result;
   }
 
+  // TODO: Make this const, if it's safe...
+  typename SuperClass::const_pointer c_str() {
+    push_back(0);
+    pop_back();
+    return this->data();
+  }
 
   void swap(SmallVectorImpl &RHS);