susumu.yata
null+****@clear*****
Mon Sep 22 17:22:23 JST 2014
susumu.yata 2014-09-22 17:22:23 +0900 (Mon, 22 Sep 2014) New Revision: e21c7aca9f2567ef4f56ce2fa5beac402a1909de https://github.com/groonga/grnxx/commit/e21c7aca9f2567ef4f56ce2fa5beac402a1909de Message: Move the definition of AndMerger::merge() into Merger. (#66) Modified files: include/grnxx/merger.hpp lib/grnxx/merger.cpp Modified: include/grnxx/merger.hpp (+1 -1) =================================================================== --- include/grnxx/merger.hpp 2014-09-22 17:14:32 +0900 (2cb8f7b) +++ include/grnxx/merger.hpp 2014-09-22 17:22:23 +0900 (1c15487) @@ -58,7 +58,7 @@ class Merger { virtual bool merge(Error *error, Array<Record> *input_records_1, Array<Record> *input_records_2, - Array<Record> *output_records) = 0; + Array<Record> *output_records); }; } // namespace grnxx Modified: lib/grnxx/merger.cpp (+10 -15) =================================================================== --- lib/grnxx/merger.cpp 2014-09-22 17:14:32 +0900 (60de4aa) +++ lib/grnxx/merger.cpp 2014-09-22 17:22:23 +0900 (84e3ead) @@ -21,11 +21,6 @@ class AndMerger : public Merger { bool finish(Error *error); - bool merge(Error *error, - Array<Record> *input_records_1, - Array<Record> *input_records_2, - Array<Record> *output_records); - private: Array<Record> *input_records_1_; Array<Record> *input_records_2_; @@ -157,16 +152,6 @@ bool AndMerger::finish(Error *error) { return true; } -bool AndMerger::merge(Error *error, - Array<Record> *input_records_1, - Array<Record> *input_records_2, - Array<Record> *output_records) { - if (!reset(error, input_records_1, input_records_2, output_records)) { - return false; - } - return finish(error); -} - // -- Merger -- Merger::Merger() {} @@ -189,4 +174,14 @@ unique_ptr<Merger> Merger::create(Error *error, const MergerOptions &options) { } } +bool Merger::merge(Error *error, + Array<Record> *input_records_1, + Array<Record> *input_records_2, + Array<Record> *output_records) { + if (!reset(error, input_records_1, input_records_2, output_records)) { + return false; + } + return finish(error); +} + } // namespace grnxx -------------- next part -------------- HTML����������������������������...다운로드
