susumu.yata
null+****@clear*****
Wed Nov 6 13:48:36 JST 2013
susumu.yata 2013-11-06 13:48:36 +0900 (Wed, 06 Nov 2013) New Revision: 37a08e70c9542654dd795f78ef1a649a56316e3b https://github.com/groonga/groonga/commit/37a08e70c9542654dd795f78ef1a649a56316e3b Message: Remove const specifiers and remove array members from initializer lists. To avoid VC++ warning C4351. Modified files: lib/dat/header.hpp lib/dat/key.hpp Modified: lib/dat/header.hpp (+1 -3) =================================================================== --- lib/dat/header.hpp 2013-11-06 13:44:27 +0900 (c48c3ae) +++ lib/dat/header.hpp 2013-11-06 13:48:36 +0900 (6b8a9ab) @@ -38,9 +38,7 @@ class Header { max_num_blocks_(0), next_key_pos_(0), key_buf_size_(0), - leaders_(), - status_flags_(0), - reserved_() { + status_flags_(0) { for (UInt32 i = 0; i <= MAX_BLOCK_LEVEL; ++i) { leaders_[i] = INVALID_LEADER; } Modified: lib/dat/key.hpp (+4 -4) =================================================================== --- lib/dat/key.hpp 2013-11-06 13:44:27 +0900 (34e25b9) +++ lib/dat/key.hpp 2013-11-06 13:48:36 +0900 (6f8671c) @@ -93,12 +93,12 @@ class Key { } private: - const UInt32 id_and_length_low_; - const UInt8 length_high_; - const UInt8 buf_[3]; + UInt32 id_and_length_low_; + UInt8 length_high_; + UInt8 buf_[3]; // Disallows instantiation. - Key() : id_and_length_low_(INVALID_KEY_ID << 4), length_high_(0), buf_() {} + Key() : id_and_length_low_(INVALID_KEY_ID << 4), length_high_(0) {} ~Key() {} // Disallows copy and assignment. -------------- next part -------------- HTML����������������������������...Download