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

diff --git a/configure b/configure
index 514ddee81d5bae22ad23d8159e72a0d447c798cf..0a9c2b6fbfac9b7abcc59510931fc0fecf6f6fda 100755 (executable)
--- 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 faefe9041048e0ed3be0a6c16530aecd6ac39637..51cc37f3f4e0231aeaccca6c31d53f2b61ba4ba3 100644 (file)
--- 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 f97630d0463070d7e3d253415f52723fc4784aae..5ca9fc18fc967e199ae7d74d450ba0d0f1e6bdda 100644 (file)
--- 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
         */