maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Roll back the use of ConstStringRef for now 

We might want try a different strategy so hold back on this for the moment, but
fix the off-by-one error in the original function template.

This reverts commit r200190.

llvm-svn: 200193
This commit is contained in:
Alp Toker 2014-01-27 05:21:24 +00:00
parent 25fa291fb2
commit 0d865d3d7b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Basic/Diagnostic.h
View File

@ -595,8 +595,10 @@ public:
///
/// \param FormatString A fixed diagnostic format string that will be hashed
/// and mapped to a unique DiagID.
unsigned getCustomDiagID(Level L, ConstStringRef FormatString) {
return Diags->getCustomDiagID((DiagnosticIDs::Level)L, FormatString);
template <unsigned N>
unsigned getCustomDiagID(Level L, const char (&FormatString)[N]) {
return Diags->getCustomDiagID((DiagnosticIDs::Level)L,
StringRef(FormatString, N - 1));
}
/// \brief Converts a diagnostic argument (as an intptr_t) into the string

2
clang/include/clang/Basic/LLVM.h
View File

@ -27,7 +27,6 @@
namespace llvm {
// ADT's.
class StringRef;
class ConstStringRef;
class Twine;
template<typename T> class ArrayRef;
template<typename T> class OwningPtr;
@ -62,7 +61,6 @@ namespace clang {
using llvm::None;
using llvm::Optional;
using llvm::StringRef;
using llvm::ConstStringRef;
using llvm::Twine;
using llvm::ArrayRef;
using llvm::OwningPtr;