Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string

compiled/String.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 21 matching lines @@
 #include "base.h"
 #include "debug.h"
 #include "library.h"
 
 ABP_NS_BEGIN
 
 inline void String_assert_writable(bool isWritable);
 
 // hacky because without templates
 #ifdef ABP_UTF8_STRING
 #define ABP_TEXT(val) val

[hub, 2018/03/13 21:29:16]

Can't we make this macro shorter? Things are getting very verbose.

[sergei, 2018/03/14 10:17:10]

I'm afraid it can clash with some another macro, so I would like to have ABP_
prefix, TEXT is just descriptive, perhaps we could shorten it to T, ABP_T. What
do you think?

Anyway now it's much easier to change it (find ./compiled/ ./test/compiled/ \(
-name \*\.
cpp -o -name \*\.h \) -exec sed -i -E "s/ABP_TEXT/ABP_T/" {} \;) because one
does not have to go through each file and check how every string literal is
used.

 struct StringTraits
 {
   typedef char char_type;
 };
 #else
 #define ABP_TEXT(val) u##val
 struct StringTraits
 {
   typedef char16_t char_type;
 };
@@ skipping 169 matching lines @@
     }
   }
 };
 
 #ifdef INSIDE_TESTS
 inline std::ostream& operator<<(std::ostream& os, const String& str)
 {
 #ifdef ABP_UTF8_STRING
   os.write(str.data(), str.length());
 #else
+#if _MSC_VER >= 1900
+  std::wstring_convert<std::codecvt_utf8_utf16<int16_t>, int16_t> converter;
+  auto p = reinterpret_cast<const int16_t *>(str.data());
+  os << converter.to_bytes(p, p + str.length());
+#else
   std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> converter;
   os << converter.to_bytes(str.data(), str.data() + str.length());
-#endif
+#endif // _MSC_VER >= 1900
+#endif // ABP_UTF8_STRING
   return os;
 }
-#endif
+#endif // INSIDE_TESTS
 
 class DependentString : public String
 {
 public:
   explicit DependentString()
       : String(nullptr, 0, INVALID)
   {
   }
 
   explicit DependentString(value_type* buf, size_type len)
@@ skipping 304 matching lines @@
   return OwnedString{value};
 }
 
 DependentString TrimSpaces(const String& value);
 
 // Splits the `value` string into two `DependentString`s excluding the character staying at `separatorPos`.
 // Useful for parsing.
 std::pair<DependentString, DependentString> SplitString(const String& value, String::size_type separatorPos);
 
 ABP_NS_END