summaryrefslogtreecommitdiff
path: root/Source/Kernel/Library/ByteArray.class.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Kernel/Library/ByteArray.class.cpp')
-rw-r--r--Source/Kernel/Library/ByteArray.class.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/Library/ByteArray.class.cpp b/Source/Kernel/Library/ByteArray.class.cpp
index b987817..9972493 100644
--- a/Source/Kernel/Library/ByteArray.class.cpp
+++ b/Source/Kernel/Library/ByteArray.class.cpp
@@ -53,11 +53,11 @@ void ByteArray::dump(VirtualTerminal *vt) {
vt->hexDump(m_string, m_length);
}
-ByteArray::operator String () {
+String ByteArray::toString (u8int encoding) {
char* c = new char[m_length + 1];
memcpy((u8int*)c, m_string, m_length);
c[m_length] = 0; //Add NULL terminator
- String r(c);
+ String r(c, encoding);
delete c;
return r;
}