diff -r 20ca0a6be175 -r 9b6a0daedfc0 sources/network/bytestream.cpp
--- a/sources/network/bytestream.cpp	Wed Jan 27 14:04:53 2021 +0200
+++ b/sources/network/bytestream.cpp	Wed Jan 27 14:05:39 2021 +0200
@@ -49,7 +49,7 @@
 	if (bytesLeft() < bytes)
 	{
 		int bytesPast = bytes - bytesLeft();
-		String message;
+		std::string message;
 		message = sprintf("attempted to read %d byte%s past the end of bytestream", bytesPast, plural(bytesPast));
 		throw IOError (message);
 	}
@@ -127,9 +127,9 @@
  * \brief Reads in characters until a null terminator is encountered.
  * \returns the read string.
  */
-String Bytestream::readString()
+std::string Bytestream::readString()
 {
-	String result;
+	std::string result;
 
 	for (char byte; (byte = readByte()) != '\0';)
 	{
@@ -201,7 +201,7 @@
  * \brief Writes the given string to the end of the data.
  * \param text String to write.
  */
-void Bytestream::writeString(const String& string)
+void Bytestream::writeString(const std::string& string)
 {
 	const int oldSize = m_data.size();
 	m_data.reserve(m_data.size() + string.length() + 1);