susumu.yata
null+****@clear*****
Tue Aug 12 11:45:14 JST 2014
susumu.yata 2014-08-12 11:45:14 +0900 (Tue, 12 Aug 2014) New Revision: bb623faaa2ae67dee0341089e811ac78a2a790f8 https://github.com/groonga/grnxx/commit/bb623faaa2ae67dee0341089e811ac78a2a790f8 Message: Remove "virtual" from filter/adjust() for invalid data types. Modified files: lib/grnxx/expression2.cpp Modified: lib/grnxx/expression2.cpp (+8 -8) =================================================================== --- lib/grnxx/expression2.cpp 2014-08-12 11:36:49 +0900 (a2a3499) +++ lib/grnxx/expression2.cpp 2014-08-12 11:45:14 +0900 (0755d9c) @@ -69,15 +69,15 @@ class TypedNode : public Node { return TypeTraits<Value>::data_type(); } - virtual bool filter(Error *error, - ArrayCRef<Record> input_records, - ArrayRef<Record> *output_records) { + bool filter(Error *error, + ArrayCRef<Record> input_records, + ArrayRef<Record> *output_records) { // Other than TypedNode<Bool> don't support filter(). GRNXX_ERROR_SET(error, INVALID_OPERATION, "Invalid operation"); return false; } - virtual bool adjust(Error *error, ArrayRef<Record> records) { + bool adjust(Error *error, ArrayRef<Record> records) { // Other than TypedNode<Float> don't support adjust(). GRNXX_ERROR_SET(error, INVALID_OPERATION, "Invalid operation"); return false; @@ -112,7 +112,7 @@ class TypedNode<Bool> : public Node { ArrayCRef<Record> input_records, ArrayRef<Record> *output_records) = 0; - virtual bool adjust(Error *error, ArrayRef<Record> records) { + bool adjust(Error *error, ArrayRef<Record> records) { // Other than TypedNode<Float> don't support adjust(). GRNXX_ERROR_SET(error, INVALID_OPERATION, "Invalid operation"); return false; @@ -158,9 +158,9 @@ class TypedNode<Float> : public Node { return TypeTraits<Value>::data_type(); } - virtual bool filter(Error *error, - ArrayCRef<Record> input_records, - ArrayRef<Record> *output_records) { + bool filter(Error *error, + ArrayCRef<Record> input_records, + ArrayRef<Record> *output_records) { // Other than TypedNode<Bool> don't support filter(). GRNXX_ERROR_SET(error, INVALID_OPERATION, "Invalid operation"); return false; -------------- next part -------------- HTML����������������������������...Download