diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-02 00:50:35 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-02 00:50:35 +0000 |
| commit | c32734fb23bb7c811076d1f4acc819020533e89c (patch) | |
| tree | 39db731b922e4b6d7ea4c07a5d93c50db433dd2e | |
| parent | 9efd48a3bd10d72d4f9cb1823aa7fbaefaece374 (diff) | |
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
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | include/modules.h | 4 | ||||
| -rw-r--r-- | include/socket.h | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -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 */ |