susumu.yata
null+****@clear*****
Wed Mar 25 18:34:57 JST 2015
susumu.yata 2015-03-25 18:34:57 +0900 (Wed, 25 Mar 2015) New Revision: b80696a9091e10c60185fe8336364f6b4bdf0989 https://github.com/groonga/grnxx/commit/b80696a9091e10c60185fe8336364f6b4bdf0989 Message: Remove invalid constexpr. Modified files: include/grnxx/data_types/vector/text.hpp Modified: include/grnxx/data_types/vector/text.hpp (+9 -9) =================================================================== --- include/grnxx/data_types/vector/text.hpp 2015-03-25 18:32:22 +0900 (5b98e64) +++ include/grnxx/data_types/vector/text.hpp 2015-03-25 18:34:57 +0900 (52b64d0) @@ -15,10 +15,10 @@ class Vector<Text> { Vector() = default; ~Vector() = default; - constexpr Vector(const Vector &) = default; + Vector(const Vector &) = default; Vector &operator=(const Vector &) = default; - constexpr Vector(const Text *data, size_t size) + Vector(const Text *data, size_t size) : is_direct_(true), size_(size), data_(data) {} @@ -27,7 +27,7 @@ class Vector<Text> { size_(size), headers_(static_cast<const Header *>(headers)), bodies_(bodies) {} - explicit constexpr Vector(NA) + explicit Vector(NA) : is_direct_(true), size_(NA()), data_(nullptr) {} @@ -47,17 +47,17 @@ class Vector<Text> { const Text &operator[](size_t i) const { return data_[i]; } - constexpr Int size() const { + Int size() const { return size_; } - constexpr size_t raw_size() const { + size_t raw_size() const { return size_.raw(); } - constexpr bool is_empty() const { + bool is_empty() const { return raw_size() == 0; } - constexpr bool is_na() const { + bool is_na() const { return size_.is_na(); } @@ -135,10 +135,10 @@ class Vector<Text> { return GRNXX_TEXT_VECTOR; } - static constexpr Vector empty() { + static Vector empty() { return Vector(nullptr, 0); } - static constexpr Vector na() { + static Vector na() { return Vector(NA()); } -------------- next part -------------- HTML����������������������������... Download