summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/inspircd.h9
-rw-r--r--include/users.h18
2 files changed, 19 insertions, 8 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index db30ca7cb..89764f1c4 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -37,6 +37,7 @@
#include <arpa/inet.h>
#include <string>
#include <deque>
+#include <sstream>
#include "inspircd_io.h"
#include "users.h"
@@ -63,6 +64,14 @@
// addition.
#define IS_SINGLE(x,y) ( (*x == y) && (*(x+1) == 0) )
+template<typename T> inline std::string ConvToStr(const T &in)
+{
+ std::stringstream tmp;
+ if (!(tmp << in)) return std::string();
+ return tmp.str();
+}
+
+
class serverstats
{
public:
diff --git a/include/users.h b/include/users.h
index b6ad57c64..dfd5c5e89 100644
--- a/include/users.h
+++ b/include/users.h
@@ -28,16 +28,18 @@
#include "hashcomp.h"
#include "cull_list.h"
-
-#define STATUS_OP 4
-#define STATUS_HOP 2
-#define STATUS_VOICE 1
-#define STATUS_NORMAL 0
-#define CC_ALLOW 0
-#define CC_DENY 1
+enum ChanStatus {
+ STATUS_OP = 4,
+ STATUS_HOP = 2,
+ STATUS_VOICE = 1,
+ STATUS_NORMAL = 0
+};
-template<typename T> string ConvToStr(const T &in);
+enum ClassTypes {
+ CC_ALLOW = 0,
+ CC_DENY = 1
+};
/** Holds a channel name to which a user has been invited.
*/