EncodedString: use a vector to store data

This commit is contained in:
josh committed 2017-01-22 18:35:18 -05:00
1 parent 0c2ac5b325
commit d7315b0268
2 files changed
+6 -5

No files matched your search

+2 -2
View File
@@ -23,8 +23,8 @@ EncodedString::EncodedString(const uint8_t * data, size_t size, Encoding::Type e
: m_encoding(encoding),
m_size(size)
{
m_data = std::shared_ptr<uint8_t>(new uint8_t[size], std::default_delete<uint8_t[]>());
memcpy(&*m_data, data, size);
m_data = std::make_shared<std::vector<uint8_t>>(size);
memcpy(&(*m_data)[0], data, size);
}
EncodedString::iterator EncodedString::begin() const
+4 -3
View File
@@ -6,6 +6,7 @@
#include <string.h>
#include <string>
#include <memory>
#include <vector>
class EncodedString
{
@@ -53,11 +54,11 @@ public:
}
const uint8_t & operator[](size_t index) const
{
return (&*m_data)[index];
return (*m_data)[index];
}
bool operator==(const std::string & s) const
{
return (m_size == s.size()) && (memcmp((&*m_data), &s[0], m_size) == 0);
return (m_size == s.size()) && (memcmp(&(*m_data)[0], &s[0], m_size) == 0);
}
bool operator!=(const std::string & s) const
{
@@ -66,7 +67,7 @@ public:
protected:
Encoding::Type m_encoding;
std::shared_ptr<uint8_t> m_data;
std::shared_ptr<std::vector<uint8_t>> m_data;
size_t m_size;
};