summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2010-06-20 20:05:23 -0400
committerAdam <Adam@anope.org>2010-06-20 20:05:23 -0400
commit0d2d7e996835c8c77c1eee5a4c90c3e2a60be4ff (patch)
tree9003a8547087e1532d2a610f41867c3d84afea6a
parent63d7bee2a65c6d389219e5bc09d0fdf4f357b9a1 (diff)
Fixed Windows build
-rw-r--r--include/operserv.h3
-rw-r--r--include/services.h2
-rw-r--r--src/operserv.cpp10
3 files changed, 11 insertions, 4 deletions
diff --git a/include/operserv.h b/include/operserv.h
index f3739fce0..c8a7e306a 100644
--- a/include/operserv.h
+++ b/include/operserv.h
@@ -43,8 +43,9 @@ enum XLineType
X_SZLINE
};
-struct XLine
+class CoreExport XLine
{
+ public:
ci::string Mask;
ci::string By;
time_t Created;
diff --git a/include/services.h b/include/services.h
index 571839050..c72d7d1f0 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1143,7 +1143,7 @@ class ChanServTimer : public Timer
* passed to the function to be incorrect. This keeps us from having to have an
* 'in use' flag on everything.
*/
-class NumberList
+class CoreExport NumberList
{
private:
std::set<unsigned> numbers;
diff --git a/src/operserv.cpp b/src/operserv.cpp
index 1dda039e4..c5e251d1a 100644
--- a/src/operserv.cpp
+++ b/src/operserv.cpp
@@ -242,7 +242,10 @@ void XLineManager::UnregisterXLineManager(XLineManager *xlm)
*/
std::pair<XLineManager *, XLine *> XLineManager::CheckAll(User *u)
{
- std::pair<XLineManager *, XLine *> ret(NULL, NULL);
+ std::pair<XLineManager *, XLine *> ret;
+
+ ret.first = NULL;
+ ret.second = NULL;
for (std::list<XLineManager *>::iterator it = XLineManagers.begin(), it_end = XLineManagers.end(); it != it_end; ++it)
{
@@ -356,7 +359,10 @@ void XLineManager::Del(XLine *x)
*/
std::pair<int, XLine *> XLineManager::CanAdd(const ci::string &mask, time_t expires)
{
- std::pair<int, XLine *> ret(0, NULL);
+ std::pair<int, XLine *> ret;
+
+ ret.first = 0;
+ ret.second = NULL;
for (unsigned i = 0, end = GetCount(); i < end; ++i)
{