Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/coding
diff options
context:
space:
mode:
authorSergey Magidovich <mgsergio@mapswithme.com>2016-02-29 13:30:02 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:49:24 +0300
commitfdbe11107ffc1bcc38bba8506741e415c1b3c306 (patch)
treeab9ba2f802a2536e3881d9c718dc034076d298d3 /coding
parent4a3989ff23d90c112b50f690e7a2c2329aa54389 (diff)
Remove SharedMemReader.
Diffstat (limited to 'coding')
-rw-r--r--coding/coding_tests/reader_test.cpp14
-rw-r--r--coding/reader.cpp5
-rw-r--r--coding/reader.hpp39
3 files changed, 0 insertions, 58 deletions
diff --git a/coding/coding_tests/reader_test.cpp b/coding/coding_tests/reader_test.cpp
index 64f910b923..0da69bb07a 100644
--- a/coding/coding_tests/reader_test.cpp
+++ b/coding/coding_tests/reader_test.cpp
@@ -88,20 +88,6 @@ UNIT_TEST(FileReaderReadAsText)
FileWriter::DeleteFileX(fName);
}
-UNIT_TEST(SharedMemReader)
-{
- SharedMemReader reader1(3);
- TEST_EQUAL(reader1.Size(), 3, ());
- memcpy(reader1.Data(), "123", 3);
- SharedMemReader reader2(reader1);
- TEST_EQUAL(reader2.Size(), 3, ());
- string s1(3, '0'), s2(3, '0');
- reader1.Read(0, &s1[0], 3);
- reader2.Read(0, &s2[0], 3);
- TEST_EQUAL(s1, "123", ());
- TEST_EQUAL(s2, "123", ());
-}
-
UNIT_TEST(ReaderStreamBuf)
{
string const name = "test.txt";
diff --git a/coding/reader.cpp b/coding/reader.cpp
index f519a9e79c..81cbdcced5 100644
--- a/coding/reader.cpp
+++ b/coding/reader.cpp
@@ -35,8 +35,3 @@ bool MemReader::AssertPosAndSize(uint64_t pos, uint64_t size) const
{
return AssertPosAndSizeImpl(pos, size, Size());
}
-
-bool SharedMemReader::AssertPosAndSize(uint64_t pos, uint64_t size) const
-{
- return AssertPosAndSizeImpl(pos, size, Size());
-}
diff --git a/coding/reader.hpp b/coding/reader.hpp
index 968395447e..f97217eaae 100644
--- a/coding/reader.hpp
+++ b/coding/reader.hpp
@@ -72,45 +72,6 @@ private:
size_t m_size;
};
-class SharedMemReader
-{
- bool AssertPosAndSize(uint64_t pos, uint64_t size) const;
-
-public:
- explicit SharedMemReader(size_t size) : m_data(new char[size]), m_offset(0), m_size(size) {}
-
- inline char * Data() { return m_data.get() + m_offset; }
- inline char const * Data() const { return m_data.get() + m_offset; }
- inline uint64_t Size() const { return m_size; }
-
- inline void Read(uint64_t pos, void * p, size_t size) const
- {
- ASSERT ( AssertPosAndSize(pos, size), () );
- memcpy(p, Data() + pos, size);
- }
-
- inline SharedMemReader SubReader(uint64_t pos, uint64_t size) const
- {
- ASSERT ( AssertPosAndSize(pos, size), () );
- return SharedMemReader(m_data, static_cast<size_t>(pos), static_cast<size_t>(size));
- }
-
- // TODO(mgsergio): return unique_ptr
- inline SharedMemReader * CreateSubReader(uint64_t pos, uint64_t size) const
- {
- ASSERT ( AssertPosAndSize(pos, size), () );
- return new SharedMemReader(m_data, static_cast<size_t>(pos), static_cast<size_t>(size));
- }
-
-private:
- SharedMemReader(shared_array<char> const & data, size_t offset, size_t size)
- : m_data(data), m_offset(offset), m_size(size) {}
-
- shared_array<char> m_data;
- size_t m_offset;
- size_t m_size;
-};
-
// Reader wrapper to hold the pointer to a polymorfic reader.
// Common use: ReaderSource<ReaderPtr<Reader> >.
// Note! It takes the ownership of Reader.