From c32734fb23bb7c811076d1f4acc819020533e89c Mon Sep 17 00:00:00 2001 From: danieldg Date: Wed, 2 Sep 2009 00:50:35 +0000 Subject: Fix some ICC-found warnings and remove unused #define git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11639 e03df62e-2008-0410-955e-edbf42e46eb7 --- configure | 1 - include/modules.h | 4 ++-- include/socket.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 514ddee81..0a9c2b6fb 100755 --- a/configure +++ b/configure @@ -936,7 +936,6 @@ sub writefiles { #define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf" #define MOD_PATH "$config{MODULE_DIR}" #define SOMAXCONN_S "$config{_SOMAXCONN}" -#define OPTIMISATION $config{OPTIMITEMP} #define LIBRARYDIR "$config{LIBRARY_DIR}" #define ENTRYPOINT int main(int argc, char** argv) diff --git a/include/modules.h b/include/modules.h index faefe9041..51cc37f3f 100644 --- a/include/modules.h +++ b/include/modules.h @@ -101,14 +101,14 @@ struct ModResult { { return !res; } - bool check(bool def) + bool check(bool def) const { return (res == 1 || (res == 0 && def)); } /** * Merges two results, preferring ALLOW to DENY */ - const ModResult operator+(const ModResult& r) + ModResult operator+(const ModResult& r) const { if (res == r.res || r.res == 0) return *this; diff --git a/include/socket.h b/include/socket.h index f97630d04..5ca9fc18f 100644 --- a/include/socket.h +++ b/include/socket.h @@ -178,7 +178,7 @@ class CoreExport ListenSocketBase : public EventHandler const std::string& GetDescription() { return desc; } /** Get port number for socket */ - const int GetPort() { return bind_port; } + int GetPort() const { return bind_port; } /** Get IP address socket is bound to */ -- cgit v1.2.3