Merge 10.6 into 10.8

storage/mroonga/lib/mrn_count_skip_checker.cpp

@@ -40,8 +40,7 @@ namespace mrn {
       is_storage_mode_(is_storage_mode) {
   }
 
-  CountSkipChecker::~CountSkipChecker() {
-  }
+  CountSkipChecker::~CountSkipChecker() = default;
 
   bool CountSkipChecker::check() {
     MRN_DBUG_ENTER_METHOD();

storage/mroonga/lib/mrn_database_repairer.cpp

@@ -57,8 +57,7 @@ namespace mrn {
       mrn_db_file_suffix_length_(strlen(MRN_DB_FILE_SUFFIX)) {
   }
 
-  DatabaseRepairer::~DatabaseRepairer() {
-  }
+  DatabaseRepairer::~DatabaseRepairer() = default;
 
   bool DatabaseRepairer::is_crashed(void) {
     MRN_DBUG_ENTER_METHOD();

storage/mroonga/lib/mrn_field_normalizer.cpp

@@ -30,8 +30,7 @@ namespace mrn {
       field_(field) {
   }
 
-  FieldNormalizer::~FieldNormalizer() {
-  }
+  FieldNormalizer::~FieldNormalizer() = default;
 
   bool FieldNormalizer::should_normalize() {
     MRN_DBUG_ENTER_METHOD();

storage/mroonga/lib/mrn_multiple_column_key_codec.cpp

@@ -70,8 +70,7 @@ namespace mrn {
       key_info_(key_info) {
   }
 
-  MultipleColumnKeyCodec::~MultipleColumnKeyCodec() {
-  }
+  MultipleColumnKeyCodec::~MultipleColumnKeyCodec() = default;
 
   int MultipleColumnKeyCodec::encode(const uchar *mysql_key,
                                      uint mysql_key_length,

storage/mroonga/lib/mrn_query_parser.cpp

@@ -44,8 +44,7 @@ namespace mrn {
       match_columns_(match_columns) {
   }
 
-  QueryParser::~QueryParser() {
-  }
+  QueryParser::~QueryParser() = default;
 
   grn_rc QueryParser::parse(const char *query, size_t query_length) {
     MRN_DBUG_ENTER_METHOD();

storage/mroonga/lib/mrn_time_converter.cpp

@@ -33,11 +33,9 @@
 #define MRN_CLASS_NAME "mrn::TimeConverter"
 
 namespace mrn {
-  TimeConverter::TimeConverter() {
-  }
+  TimeConverter::TimeConverter() = default;
 
-  TimeConverter::~TimeConverter() {
-  }
+  TimeConverter::~TimeConverter() = default;
 
   time_t TimeConverter::tm_to_time_gm(struct tm *time, bool *truncated) {
     MRN_DBUG_ENTER_METHOD();

storage/mroonga/vendor/groonga/lib/dat/array.hpp

@@ -33,7 +33,7 @@ class GRN_DAT_API Array {
   }
   template <UInt32 U>
   explicit Array(T (&array)[U]) : ptr_(array), size_(U) {}
-  ~Array() {}
+  ~Array() = default;
 
   const T &operator[](UInt32 i) const {
     GRN_DAT_DEBUG_THROW_IF(i >= size_);

storage/mroonga/vendor/groonga/lib/dat/cursor.hpp

@@ -25,8 +25,8 @@ namespace dat {
 
 class GRN_DAT_API Cursor {
  public:
-  Cursor() {}
-  virtual ~Cursor() {}
+  Cursor() = default;
+  virtual ~Cursor() = default;
 
   virtual void close() = 0;
 

storage/mroonga/vendor/groonga/lib/dat/dat.hpp

@@ -175,12 +175,8 @@ class Exception : public std::exception {
         file_(file),
         line_(line),
         what_((what != NULL) ? what : "") {}
-  Exception(const Exception &ex) throw()
-      : std::exception(ex),
-        file_(ex.file_),
-        line_(ex.line_),
-        what_(ex.what_) {}
-  virtual ~Exception() throw() {}
+  Exception(const Exception &ex) throw() = default;
+  virtual ~Exception() throw() = default;
 
   virtual ErrorCode code() const throw() = 0;
   virtual const char *file() const throw() {
@@ -208,7 +204,7 @@ class Error : public Exception {
       : Exception(file, line, what) {}
   Error(const Error &ex) throw()
       : Exception(ex) {}
-  virtual ~Error() throw() {}
+  virtual ~Error() throw() = default;
 
   virtual ErrorCode code() const throw() {
     return T;

storage/mroonga/vendor/groonga/lib/dat/id-cursor.cpp

@@ -33,7 +33,7 @@ IdCursor::IdCursor()
       end_(INVALID_KEY_ID),
       count_(0) {}
 
-IdCursor::~IdCursor() {}
+IdCursor::~IdCursor() = default;
 
 void IdCursor::open(const Trie &trie,
                     const String &min_str,

storage/mroonga/vendor/groonga/lib/dat/key.hpp

@@ -99,7 +99,7 @@ class GRN_DAT_API Key {
 
   // Disallows instantiation.
   Key() : id_and_length_low_(INVALID_KEY_ID << 4), length_high_(0) {}
-  ~Key() {}
+  ~Key() = default;
 
   // Disallows copy and assignment.
   Key(const Key &);

storage/mroonga/vendor/groonga/lib/dat/predictive-cursor.cpp

@@ -35,7 +35,7 @@ PredictiveCursor::PredictiveCursor()
       end_(0),
       min_length_(0) {}
 
-PredictiveCursor::~PredictiveCursor() {}
+PredictiveCursor::~PredictiveCursor() = default;
 
 void PredictiveCursor::open(const Trie &trie,
                             const String &str,

storage/mroonga/vendor/groonga/lib/dat/prefix-cursor.cpp

@@ -33,7 +33,7 @@ PrefixCursor::PrefixCursor()
       cur_(0),
       end_(0) {}
 
-PrefixCursor::~PrefixCursor() {}
+PrefixCursor::~PrefixCursor() = default;
 
 void PrefixCursor::open(const Trie &trie,
                         const String &str,

storage/mroonga/vendor/groonga/lib/dat/string.hpp

@@ -35,9 +35,7 @@ class GRN_DAT_API String {
   explicit String(const char (&str)[T])
       : ptr_(reinterpret_cast<const UInt8 *>(str)),
         length_(T - 1) {}
-  String(const String &rhs)
-      : ptr_(rhs.ptr_),
-        length_(rhs.length_) {}
+  String(const String &rhs) = default;
 
   String &operator=(const String &rhs) {
     set_ptr(rhs.ptr());

storage/mroonga/vendor/groonga/lib/dat/trie.cpp

@@ -55,7 +55,7 @@ Trie::Trie()
       entries_(),
       key_buf_() {}
 
-Trie::~Trie() {}
+Trie::~Trie() = default;
 
 void Trie::create(const char *file_name,
                   UInt64 file_size,