RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-26 21:20:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support: Move c_str from SmallVector back to SmallString and add a free standing

Browse Source 
templated c_str in Windows.h to replace it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121381 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael J. Spencer 2010-12-09 17:37:18 +00:00
parent 61187dd0ad
commit 58fe86dc0e
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/ADT/SmallString.h
View File

@ -38,6 +38,13 @@ public:
// Extra methods.
StringRef str() const { return StringRef(this->begin(), this->size()); }
// TODO: Make this const, if it's safe...
const char* c_str() {
this->push_back(0);
this->pop_back();
return this->data();
}
// Implicit conversion to StringRef.
operator StringRef() const { return str(); }

7
include/llvm/ADT/SmallVector.h
View File

@ -340,13 +340,6 @@ 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);
/// append - Add the specified range to the end of the SmallVector.

2
lib/Support/Windows/PathV2.inc
View File

@ -623,7 +623,7 @@ error_code directory_iterator_construct(directory_iterator& it,
// Get the first directory entry.
WIN32_FIND_DATAW FirstFind;
ScopedFindHandle FindHandle(::FindFirstFileW(path_utf16.c_str(), &FirstFind));
ScopedFindHandle FindHandle(::FindFirstFileW(c_str(path_utf16), &FirstFind));
if (!FindHandle)
return windows_error(::GetLastError());

13
lib/Support/Windows/Windows.h
View File

@ -102,3 +102,16 @@ public:
typedef ScopedHandle<HANDLE, uintptr_t(-1),
BOOL (WINAPI*)(HANDLE), ::FindClose>
ScopedFindHandle;
namespace llvm {
template <class T>
class SmallVectorImpl;
template <class T>
typename SmallVectorImpl<T>::const_pointer
c_str(SmallVectorImpl<T> &str) {
str.push_back(0);
str.pop_back();
return str.data();
}
} // end namespace llvm.