diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-01-07 17:53:40 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-01-07 17:53:40 +0100 |
commit | 1d96a615b5d1578912ec2e95c03dee6781cb3396 (patch) | |
tree | bf8ba708d71ccbd03adb8a282deaa8e65c78fbbe /src/StringUtils.cpp | |
parent | Merge pull request #514 from derouinw/master (diff) | |
download | cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.gz cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.bz2 cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.lz cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.xz cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.zst cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.zip |
Diffstat (limited to 'src/StringUtils.cpp')
-rw-r--r-- | src/StringUtils.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp index e6deb0705..5d16616c5 100644 --- a/src/StringUtils.cpp +++ b/src/StringUtils.cpp @@ -759,7 +759,8 @@ AString Base64Decode(const AString & a_Base64String) } } res.resize(o >> 3); - return res;} + return res; +} @@ -774,7 +775,7 @@ AString Base64Encode(const AString & a_Input) 'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/' }; - std::string output; + AString output; output.resize(((a_Input.size() + 2) / 3) * 4); size_t output_index = 0; @@ -804,7 +805,7 @@ AString Base64Encode(const AString & a_Input) output[output_index++] = '='; } - assert(output_index == output.size()); + ASSERT(output_index == output.size()); return output; } |