diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index dc4ce18dee..c3427e2855 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -12760,7 +12760,7 @@ const String StringArray::joinIntoString (const String& separator, int start, in
 
 int StringArray::addTokens (const String& text, const bool preserveQuotedStrings)
 {
-	return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : 0);
+	return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : T(""));
 }
 
 int StringArray::addTokens (const String& text, const String& breakCharacters, const String& quoteCharacters)
@@ -29976,7 +29976,7 @@ static bool getComponentDescFromIdentifier (const String& fileOrIdentifier, Comp
 													fileOrIdentifier.lastIndexOfChar (T('/'))) + 1));
 
 		StringArray tokens;
-		tokens.addTokens (s, T(","), 0);
+		tokens.addTokens (s, T(","), String::empty);
 		tokens.trim();
 		tokens.removeEmptyStrings();
 
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 03f775c9e9..d1eca81e93 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -10105,7 +10105,7 @@ public:
 	static const Rectangle fromString (const String& stringVersion)
 	{
 		StringArray toks;
-		toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), 0);
+		toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), String::empty);
 
 		return Rectangle (toks[0].trim().getIntValue(),
 						  toks[1].trim().getIntValue(),
diff --git a/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm b/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm
index 7a5b2516f1..4e24e5d2f2 100644
--- a/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm
+++ b/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm
@@ -165,7 +165,7 @@ static bool getComponentDescFromIdentifier (const String& fileOrIdentifier, Comp
                                                     fileOrIdentifier.lastIndexOfChar (T('/'))) + 1));
 
         StringArray tokens;
-        tokens.addTokens (s, T(","), 0);
+        tokens.addTokens (s, T(","), String::empty);
         tokens.trim();
         tokens.removeEmptyStrings();
 
diff --git a/src/gui/graphics/geometry/juce_Rectangle.h b/src/gui/graphics/geometry/juce_Rectangle.h
index d94334b9fd..296c7c25fa 100644
--- a/src/gui/graphics/geometry/juce_Rectangle.h
+++ b/src/gui/graphics/geometry/juce_Rectangle.h
@@ -513,7 +513,7 @@ public:
     static const Rectangle fromString (const String& stringVersion)
     {
         StringArray toks;
-        toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), 0);
+        toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), String::empty);
 
         return Rectangle (toks[0].trim().getIntValue(),
                           toks[1].trim().getIntValue(),
diff --git a/src/text/juce_StringArray.cpp b/src/text/juce_StringArray.cpp
index ffb96c83a4..398981f27e 100644
--- a/src/text/juce_StringArray.cpp
+++ b/src/text/juce_StringArray.cpp
@@ -329,7 +329,7 @@ const String StringArray::joinIntoString (const String& separator, int start, in
 
 int StringArray::addTokens (const String& text, const bool preserveQuotedStrings)
 {
-    return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : 0);
+    return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : T(""));
 }
 
 int StringArray::addTokens (const String& text, const String& breakCharacters, const String& quoteCharacters)