Merge 10.4 into 10.5

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();