From ec7dfb3675973e0e0ec6df69c871797bc94e8413 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 4 Jan 2022 12:36:35 +0000 Subject: [PATCH] Use C++11 header names instead of their deprecated equivalents. --- modules/encryption/enc_bcrypt.cpp | 2 +- modules/webcpanel/static_fileserver.cpp | 2 +- modules/webcpanel/template_fileserver.cpp | 2 +- src/init.cpp | 6 +++--- src/main.cpp | 2 +- src/misc.cpp | 4 ++-- src/socket_clients.cpp | 2 +- src/socketengines/socketengine_epoll.cpp | 2 +- src/sockets.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/encryption/enc_bcrypt.cpp b/modules/encryption/enc_bcrypt.cpp index b5e65648e..6301579f2 100644 --- a/modules/encryption/enc_bcrypt.cpp +++ b/modules/encryption/enc_bcrypt.cpp @@ -55,7 +55,7 @@ * hadn't seen his code). */ -#include +#include #ifdef __i386__ #define BF_SCALE 1 diff --git a/modules/webcpanel/static_fileserver.cpp b/modules/webcpanel/static_fileserver.cpp index 2bfe48bee..1c706a886 100644 --- a/modules/webcpanel/static_fileserver.cpp +++ b/modules/webcpanel/static_fileserver.cpp @@ -6,8 +6,8 @@ */ #include "webcpanel.h" +#include #include -#include #include #include diff --git a/modules/webcpanel/template_fileserver.cpp b/modules/webcpanel/template_fileserver.cpp index 1f61b0bda..beee5a390 100644 --- a/modules/webcpanel/template_fileserver.cpp +++ b/modules/webcpanel/template_fileserver.cpp @@ -6,9 +6,9 @@ */ #include "webcpanel.h" +#include #include #include -#include #include #include diff --git a/src/init.cpp b/src/init.cpp index 48e3ebbfc..0620ca253 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -23,10 +23,10 @@ #include #include -#include -#include -#include +#include #include +#include +#include #endif Anope::string Anope::ConfigDir = "conf", Anope::DataDir = "data", Anope::ModuleDir = "lib", Anope::LocaleDir = "locale", Anope::LogDir = "logs"; diff --git a/src/main.cpp b/src/main.cpp index f4db34054..09bcea007 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,7 @@ #include "uplink.h" #ifndef _WIN32 -#include +#include #else #include #endif diff --git a/src/misc.cpp b/src/misc.cpp index 11f038710..a94ea21db 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -19,9 +19,9 @@ #include "regexpr.h" #include "sockets.h" -#include -#include +#include #include +#include #ifndef _WIN32 #include #include diff --git a/src/socket_clients.cpp b/src/socket_clients.cpp index 1b559eb25..3f257734d 100644 --- a/src/socket_clients.cpp +++ b/src/socket_clients.cpp @@ -14,7 +14,7 @@ #include "logger.h" #include "sockets.h" -#include +#include void ConnectionSocket::Connect(const Anope::string &TargetHost, int Port) { diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index 851fea4e4..b8de4bb79 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -15,9 +15,9 @@ #include "socketengine.h" #include "config.h" +#include #include #include -#include static int EngineHandle; static std::vector events; diff --git a/src/sockets.cpp b/src/sockets.cpp index b05927691..84fb85098 100644 --- a/src/sockets.cpp +++ b/src/sockets.cpp @@ -16,7 +16,7 @@ #ifndef _WIN32 #include -#include +#include #include #endif