diff --git a/coding/reader.cpp b/coding/reader.cpp index b7f4a1c59d..e682e12c01 100644 --- a/coding/reader.cpp +++ b/coding/reader.cpp @@ -10,7 +10,7 @@ void Reader::ReadAsString(string & s) const Read(0, &s[0], sz); } -vector Reader::Contents() const +vector Reader::ReadAsBytes() const { vector contents; contents.resize(Size()); diff --git a/coding/reader.hpp b/coding/reader.hpp index 5ff276ccc1..2c86532fce 100644 --- a/coding/reader.hpp +++ b/coding/reader.hpp @@ -32,7 +32,7 @@ public: // Reads the contents of this Reader to a vector of 8-bit bytes. // Similar to ReadAsString but makes no assumptions about the char type. - vector Contents() const; + vector ReadAsBytes() const; static bool IsEqual(string const & name1, string const & name2); }; diff --git a/generator/mwm_diff/mwm_diff_tests/diff_test.cpp b/generator/mwm_diff/mwm_diff_tests/diff_test.cpp index 7011163a81..48b65acc5a 100644 --- a/generator/mwm_diff/mwm_diff_tests/diff_test.cpp +++ b/generator/mwm_diff/mwm_diff_tests/diff_test.cpp @@ -49,7 +49,7 @@ UNIT_TEST(IncrementalUpdates_Smoke) { // Alter the old mwm slightly. - vector oldMwmContents = FileReader(oldMwmPath).Contents(); + vector oldMwmContents = FileReader(oldMwmPath).ReadAsBytes(); size_t const sz = oldMwmContents.size(); for (size_t i = 3 * sz / 10; i < 4 * sz / 10; i++) oldMwmContents[i] += static_cast(i); @@ -65,7 +65,7 @@ UNIT_TEST(IncrementalUpdates_Smoke) { // Corrupt the diff file contents. - vector diffContents = FileReader(diffPath).Contents(); + vector diffContents = FileReader(diffPath).ReadAsBytes(); // Leave the version bits intact. for (size_t i = 4; i < diffContents.size(); i += 2)