From 92c91a67cc3048ad6c240a7ea9f65eae3af1633a Mon Sep 17 00:00:00 2001 From: bel Date: Sun, 22 May 2016 21:34:59 +0200 Subject: [PATCH] Auto format code after merge --- include/CivetServer.h | 5 +++-- src/CivetServer.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/CivetServer.h b/include/CivetServer.h index 878655da..ee15ae30 100644 --- a/include/CivetServer.h +++ b/include/CivetServer.h @@ -198,7 +198,7 @@ class CIVETWEB_API CivetWebSocketHandler * wrapper for mg_callbacks */ struct CIVETWEB_API CivetCallbacks : public mg_callbacks { - CivetCallbacks(); + CivetCallbacks(); }; /** @@ -226,7 +226,8 @@ class CIVETWEB_API CivetServer * * @throws CivetException */ - CivetServer(const char **options, const struct CivetCallbacks *callbacks = 0); + CivetServer(const char **options, + const struct CivetCallbacks *callbacks = 0); CivetServer(std::vector options, const struct CivetCallbacks *callbacks = 0); diff --git a/src/CivetServer.cpp b/src/CivetServer.cpp index e607a0e9..d7d38a5e 100644 --- a/src/CivetServer.cpp +++ b/src/CivetServer.cpp @@ -265,7 +265,7 @@ CivetServer::webSocketCloseHandler(const struct mg_connection *conn, CivetCallbacks::CivetCallbacks() { - memset(this, 0, sizeof(*this)); + memset(this, 0, sizeof(*this)); } CivetServer::CivetServer(const char **options,