Remove unused #define ERROR -1

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index 60c8f761db0030165a6ac205266e06ad2215c83f..dab00d31cf9492e04f173e3d27f187378ea57e42 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -80,10 +80,6 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "protocol.h"
 #include "bancache.h"
 
-/** Returned by some functions to indicate failure.
- */
-#define ERROR -1
-
 /** Template function to convert any input type to std::string
  */
 template<typename T> inline std::string ConvNumeric(const T &in)
@@ -343,7 +339,7 @@ class CoreExport InspIRCd
 
        /** Command parser, handles client to server commands
         */
-       CommandParser* Parser;
+       CommandParser Parser;
 
        /** Thread engine, Handles threading where required
         */
@@ -365,7 +361,7 @@ class CoreExport InspIRCd
        /** BanCacheManager is used to speed up checking of restrictions on connection
         * to the IRCd.
         */
-       BanCacheManager *BanCache;
+       BanCacheManager BanCache;
 
        /** Stats class, holds miscellaneous stats counters
         */
@@ -408,6 +404,10 @@ class CoreExport InspIRCd
         */
        ProtocolInterface* PI;
 
+       /** Default implementation of the ProtocolInterface, does nothing
+        */
+       ProtocolInterface DefaultProtocolInterface;
+
        /** Holds extensible for user operquit
         */
        StringExtItem OperQuit;