susumu.yata
null+****@clear*****
Mon Jul 28 13:38:20 JST 2014
susumu.yata 2014-07-28 13:38:20 +0900 (Mon, 28 Jul 2014) New Revision: 828e635ea71536665ea40b7916a20e4fb0691098 https://github.com/groonga/grnxx/commit/828e635ea71536665ea40b7916a20e4fb0691098 Message: Update Order to use Array. Modified files: include/grnxx/order.hpp lib/grnxx/order.cpp Modified: include/grnxx/order.hpp (+3 -4) =================================================================== --- include/grnxx/order.hpp 2014-07-28 11:09:11 +0900 (348adbb) +++ include/grnxx/order.hpp 2014-07-28 13:38:20 +0900 (742dceb) @@ -1,8 +1,7 @@ #ifndef GRNXX_ORDER_HPP #define GRNXX_ORDER_HPP -#include <vector> - +#include "grnxx/array.hpp" #include "grnxx/types.hpp" namespace grnxx { @@ -36,7 +35,7 @@ class OrderSet { } private: - std::vector<Order> orders_; + Array<Order> orders_; OrderSet(); @@ -93,7 +92,7 @@ class OrderSetBuilder { private: const Table *table_; - std::vector<Order> orders_; + Array<Order> orders_; OrderSetBuilder(); }; Modified: lib/grnxx/order.cpp (+2 -14) =================================================================== --- lib/grnxx/order.cpp 2014-07-28 11:09:11 +0900 (1c66416) +++ lib/grnxx/order.cpp 2014-07-28 13:38:20 +0900 (db000e2) @@ -10,13 +10,7 @@ OrderSet::~OrderSet() {} OrderSet::OrderSet() : orders_() {} bool OrderSet::append(Error *error, Order &&order) { - try { - orders_.push_back(std::move(order)); - return true; - } catch (...) { - GRNXX_ERROR_SET(error, NO_MEMORY, "Memory allocation failed"); - return false; - } + return orders_.push_back(error, std::move(order)); } unique_ptr<OrderSetBuilder> OrderSetBuilder::create(Error *error, @@ -35,13 +29,7 @@ OrderSetBuilder::~OrderSetBuilder() {} bool OrderSetBuilder::append(Error *error, unique_ptr<Expression> &&expression, OrderType type) { - try { - orders_.push_back(Order(std::move(expression), type)); - return true; - } catch (...) { - GRNXX_ERROR_SET(error, NO_MEMORY, "Memory allocation failed"); - return false; - } + return orders_.push_back(error, Order(std::move(expression), type)); } void OrderSetBuilder::clear() { -------------- next part -------------- HTML����������������������������...下載
