mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

Disambiguations to keep the MS compiler happy when using UTF32 string mode.

Browse source
This commit is contained in:
jules 2013-09-13 16:12:05 +01:00
parent a8b41cb717
commit addd649b27
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/juce_core/text/juce_NewLine.h
View file

@ -79,5 +79,8 @@ extern NewLine newLine;
*/
JUCE_API String& JUCE_CALLTYPE operator<< (String& string1, const NewLine&);
#if JUCE_STRING_UTF_TYPE != 8 && ! defined (DOXYGEN)
inline String operator+ (String s1, const NewLine&) { return s1 += NewLine::getDefault(); }
#endif
#endif // JUCE_NEWLINE_H_INCLUDED

5
modules/juce_core/text/juce_String.cpp
View file

@ -580,6 +580,11 @@ bool String::equalsIgnoreCase (const char* const t) const noexcept
: isEmpty();
}
bool String::equalsIgnoreCase (StringRef t) const noexcept
{
return text.compareIgnoreCase (t.text) == 0;
}
bool String::equalsIgnoreCase (const String& other) const noexcept
{
return text == other.text

3
modules/juce_core/text/juce_String.h
View file

@ -296,6 +296,9 @@ public:
/** Case-insensitive comparison with another string. */
bool equalsIgnoreCase (const String& other) const noexcept;
/** Case-insensitive comparison with another string. */
bool equalsIgnoreCase (StringRef other) const noexcept;
/** Case-insensitive comparison with another string. */
bool equalsIgnoreCase (const wchar_t* other) const noexcept;

3
modules/juce_core/text/juce_StringRef.h
View file

@ -128,5 +128,8 @@ JUCE_API bool JUCE_CALLTYPE operator== (const String& string1, StringRef string2
/** Case-sensitive comparison of two strings. */
JUCE_API bool JUCE_CALLTYPE operator!= (const String& string1, StringRef string2) noexcept;
#if JUCE_STRING_UTF_TYPE != 8 && ! defined (DOXYGEN)
inline String operator+ (String s1, StringRef s2) { return s1 += String (s2.text); }
#endif
#endif // JUCE_STRINGREF_H_INCLUDED