Skip to content

Commit 4ef375d

Browse files
committed
Bug#37471922: Auto-fix clang-tidy warnings [21/n] [noclose]
Generate fixes for a number of warnings that clang-tidy can fix automatically. This commit fixes the warning 'readability-duplicate-include'. Change example: - #include "scope_guard.h" Change-Id: I7eb0ca0a0389568d47c71f61990d21aac53be753
1 parent e06e6ee commit 4ef375d

File tree

10 files changed

+3
-14
lines changed

10 files changed

+3
-14
lines changed

components/test/test_mysql_thd_store_service.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2424
#include <string>
2525
#include <vector>
2626

27-
#include <scope_guard.h> /* create_scope_guard */
27+
#include "scope_guard.h" /* create_scope_guard */
2828

2929
#include "mysql/components/component_implementation.h"
3030
#include "mysql/components/service_implementation.h"
3131
#include "mysql/components/services/mysql_current_thread_reader.h"
3232
#include "mysql/components/services/mysql_thd_store_service.h"
3333
#include "mysql/components/services/udf_registration.h"
34-
#include "scope_guard.h"
3534

3635
REQUIRES_SERVICE_PLACEHOLDER_AS(mysql_current_thread_reader, thread_service);
3736
REQUIRES_SERVICE_PLACEHOLDER_AS(mysql_thd_store, mysql_thd_store_service);

mysys/my_file.cc

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#include "mysql/service_mysql_alloc.h"
5454
#include "mysys/my_static.h"
5555
#include "mysys/mysys_priv.h"
56-
#include "sql/malloc_allocator.h"
5756
#include "sql/stateless_allocator.h"
5857
#ifdef HAVE_SYS_RESOURCE_H
5958
#include <sys/resource.h> /* RLIMIT_NOFILE */

mysys/my_mmap.cc

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include <sys/mman.h>
3838
#endif
3939

40-
#include "my_config.h"
4140
#include "my_dbug.h"
4241
#include "my_inttypes.h"
4342
#include "my_sys.h"

storage/ndb/src/common/util/cstrbuf.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ int cstrbuf_vsnprintf_noerr(char str[], size_t size, const char fmt[],
4343

4444
#ifdef TEST_CSTRBUF
4545

46-
#include <cstdio>
4746
#include <cstring>
4847
#include <string>
4948
#include <vector>

storage/ndb/src/common/util/md5_hash.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
*/
2424

2525
#include "md5_hash.hpp"
26-
#include "my_config.h"
2726

28-
#include <my_compiler.h> // likely
29-
#include <my_config.h> // big/little endian
3027
#include <cstring> // memcpy()
28+
#include "my_compiler.h" // likely
29+
#include "my_config.h" // big/little endian
3130

3231
/*
3332
* This code implements the MD5 message-digest algorithm.

storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,6 @@ void Ndbd_mem_manager::init_resource_spare(Uint32 id, Uint32 pct) {
989989
mt_mem_manager_unlock();
990990
}
991991

992-
#include <NdbOut.hpp>
993-
994992
void Ndbd_mem_manager::grow(Uint32 start, Uint32 cnt) {
995993
assert(cnt);
996994
Uint32 start_bmp = start >> BPP_2LOG;

storage/ndb/src/ndbapi/API.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
#include "NdbQueryOperation.hpp"
6060
#include "NdbQueryOperationImpl.hpp"
6161

62-
#include <NdbReceiver.hpp>
6362
#include "NdbImpl.hpp"
6463

6564
#include "TransporterFacade.hpp"

storage/ndb/src/ndbapi/ClusterMgr.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252

5353
#include <mgmapi.h>
5454
#include <mgmapi_config_parameters.h>
55-
#include <EventLogger.hpp>
5655
#include <mgmapi_configuration.hpp>
5756

5857
#if 0

storage/ndb/src/ndbapi/NdbOperationExec.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include <ndb_version.h>
3939

4040
#include <NdbOut.hpp>
41-
#include "API.hpp"
4241

4342
/**
4443
* Old NdbApi KeyInfo Section Iterator

storage/ndb/src/ndbapi/SectionIterators.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ const Uint32 *FragmentedSectionIterator::getNextWords(Uint32 &sz) {
241241

242242
#include <random.h>
243243
#include <util/NdbTap.hpp>
244-
#include "NdbApiSignal.hpp"
245244

246245
#define VERIFY(x) \
247246
if ((x) == 0) { \

0 commit comments

Comments
 (0)