diff options
| author | Enrico Granata <egranata@apple.com> | 2012-09-06 17:03:42 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2012-09-06 17:03:42 +0000 |
| commit | 2675b8ed4063ee1d2553cb4acad54d86b2d2047c (patch) | |
| tree | 47ef4884cb278ecd501de83ff69e98dc3609e8f6 | |
| parent | 2d234d73f687428c89f8a99af94f123012f05551 (diff) | |
Enabling the UTF conversion routines that were previously conditionally ifdef'ed out. This change is required to support enhancements in the LLDB data formatters
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163331 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/ConvertUTF.h | 2 | ||||
| -rw-r--r-- | lib/Basic/ConvertUTF.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/clang/Basic/ConvertUTF.h b/include/clang/Basic/ConvertUTF.h index e7cfa8a767..5be304b475 100644 --- a/include/clang/Basic/ConvertUTF.h +++ b/include/clang/Basic/ConvertUTF.h @@ -147,7 +147,6 @@ ConversionResult ConvertUTF32toUTF8 ( const UTF32** sourceStart, const UTF32* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); -#ifdef CLANG_NEEDS_THESE_ONE_DAY ConversionResult ConvertUTF16toUTF32 ( const UTF16** sourceStart, const UTF16* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags); @@ -194,7 +193,6 @@ bool ConvertUTF8toWide(unsigned WideCharWidth, llvm::StringRef Source, bool ConvertCodePointToUTF8(unsigned Source, char *&ResultPtr); } -#endif #endif diff --git a/lib/Basic/ConvertUTF.c b/lib/Basic/ConvertUTF.c index 4793b251f6..2e25e79c4c 100644 --- a/lib/Basic/ConvertUTF.c +++ b/lib/Basic/ConvertUTF.c @@ -111,7 +111,6 @@ static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC * into an inline function. */ -#ifdef CLANG_NEEDS_THESE_ONE_DAY /* --------------------------------------------------------------------- */ @@ -285,7 +284,6 @@ ConversionResult ConvertUTF16toUTF8 ( *targetStart = target; return result; } -#endif /* --------------------------------------------------------------------- */ |