Add ArrayRef constructor from None, and do the cleanups that this constructor enables

[oota-llvm.git] / include / llvm / Support / ConvertUTF.h

diff --git a/include/llvm/Support/ConvertUTF.h b/include/llvm/Support/ConvertUTF.h
index f2dc7ea33df8bb27324acbbe11d59141fb6daa41..1eae6d66222946574ea1512eea07e0d5e9b3c31f 100644 (file)
--- a/include/llvm/Support/ConvertUTF.h
+++ b/include/llvm/Support/ConvertUTF.h
@@ -137,11 +137,9 @@ ConversionResult ConvertUTF8toUTF32 (
   const UTF8** sourceStart, const UTF8* sourceEnd,
   UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
 
-#ifdef CLANG_NEEDS_THESE_ONE_DAY
 ConversionResult ConvertUTF16toUTF8 (
   const UTF16** sourceStart, const UTF16* sourceEnd,
   UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
-#endif
 
 ConversionResult ConvertUTF32toUTF8 (
   const UTF32** sourceStart, const UTF32* sourceEnd,
@@ -221,7 +219,7 @@ static inline ConversionResult convertUTF8Sequence(const UTF8 **source,
     return sourceExhausted;
   return ConvertUTF8toUTF32(source, *source + size, &target, target + 1, flags);
 }
-} // end namespace llvm
+} /* end namespace llvm */
 
 #endif