1
0
mirror of https://github.com/anope/anope.git synced 2026-06-30 16:26:39 +02:00

Remove some CoreExports and add them in other places, fixed a few minor warnings under Windows build, made Windows build create a static library out of win32_memory.cpp and use that with everything instead of relying on it being compiled into everything (saves compiling time).

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2656 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
cyberbotx
2009-11-18 01:05:12 +00:00
parent e10fe1cd76
commit da8a1c7b60
13 changed files with 65 additions and 60 deletions
+1 -1
View File
@@ -66,7 +66,7 @@ enum NickCoreFlag
/** XXX: this really needs to die with fire and be merged with metadata into NickCore or something.
*/
class NickRequest
class CoreExport NickRequest
{
public:
NickRequest(const std::string &nickname);
+7 -7
View File
@@ -113,7 +113,7 @@ namespace irc
* @return similar to strcmp, zero for equal, less than zero for str1
* being less and greater than zero for str1 being greater than str2.
*/
static CoreExport int compare(const char *str1, const char *str2, size_t n);
static int compare(const char *str1, const char *str2, size_t n);
/** Find a char within a string up to position n.
* @param s1 String to find in
@@ -121,7 +121,7 @@ namespace irc
* @param c Character to search for
* @return Pointer to the first occurance of c in s1
*/
static CoreExport const char *find(const char *s1, int n, char c);
static const char *find(const char *s1, int n, char c);
};
/** This typedef declares irc::string based upon irc_char_traits.
@@ -137,7 +137,7 @@ namespace ci
* This class is used to implement ci::string, a case-insensitive, ASCII-
* comparing string class.
*/
struct ci_char_traits : std::char_traits<char>
struct CoreExport ci_char_traits : std::char_traits<char>
{
/** Check if two chars match.
* @param c1st First character
@@ -167,7 +167,7 @@ namespace ci
* @return similar to strcmp, zero for equal, less than zero for str1
* being less and greater than zero for str1 being greater than str2.
*/
static CoreExport int compare(const char *str1, const char *str2, size_t n);
static int compare(const char *str1, const char *str2, size_t n);
/** Find a char within a string up to position n.
* @param s1 String to find in
@@ -175,7 +175,7 @@ namespace ci
* @param c Character to search for
* @return Pointer to the first occurance of c in s1
*/
static CoreExport const char *find(const char *s1, int n, char c);
static const char *find(const char *s1, int n, char c);
};
/** This typedef declares ci::string based upon ci_char_traits.
@@ -449,7 +449,7 @@ class CoreExport sepstream
/** A derived form of sepstream, which seperates on commas
*/
class CoreExport commasepstream : public sepstream
class commasepstream : public sepstream
{
public:
/** Initialize with comma seperator
@@ -461,7 +461,7 @@ class CoreExport commasepstream : public sepstream
/** A derived form of sepstream, which seperates on spaces
*/
class CoreExport spacesepstream : public sepstream
class spacesepstream : public sepstream
{
public:
/** Initialize with space seperator
+1 -1
View File
@@ -276,7 +276,7 @@ class CoreExport Command : public Flags<CommandFlag>
Command *next;
};
class CoreExport Version
class Version
{
private:
unsigned Major;
+22 -22
View File
@@ -245,7 +245,7 @@ extern int strncasecmp(const char *, const char *, size_t);
* be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user
* attempting to load the module, or dumped to the console if the ircd is currently loading for the first time.
*/
class CoreExport CoreException : public std::exception
class CoreException : public std::exception
{
protected:
/** Holds the error message to be displayed
@@ -284,7 +284,7 @@ class CoreExport CoreException : public std::exception
}
};
class CoreExport ModuleException : public CoreException
class ModuleException : public CoreException
{
public:
/** Default constructor, just uses the error mesage 'Module threw an exception'.
@@ -421,7 +421,7 @@ class CoreExport Extensible
/** Class with the ability to keep flags on items, they should extend from this
* where T is an enum.
*/
template<typename T> class CoreExport Flags
template<typename T> class Flags
{
protected:
std::bitset<128> Flag_Values;
@@ -474,7 +474,7 @@ template<typename T> class CoreExport Flags
class User;
class ChannelInfo;
class Channel;
class EList;
struct EList;
typedef struct bandata_ BanData;
typedef struct userdata_ UserData;
@@ -644,7 +644,7 @@ enum MemoFlag
/* Memo info structures. Since both nicknames and channels can have memos,
* we encapsulate memo data in a MemoList to make it easier to handle. */
class CoreExport Memo : public Flags<MemoFlag>
class Memo : public Flags<MemoFlag>
{
public:
uint32 number; /* Index number -- not necessarily array position! */
@@ -716,7 +716,7 @@ enum AutoKickFlag
};
/* AutoKick data. */
class CoreExport AutoKick : public Flags<AutoKickFlag>
class AutoKick : public Flags<AutoKickFlag>
{
public:
/* Only one of these can be in use */
@@ -872,7 +872,7 @@ enum ServerFlag
SERVER_END
};
class CoreExport Server : public Flags<ServerFlag>
class Server : public Flags<ServerFlag>
{
public:
Server *next, *prev;
@@ -1069,7 +1069,7 @@ enum EntryType
ENTRYTYPE_HOST
};
class CoreExport Entry : public Flags<EntryType>
class Entry : public Flags<EntryType>
{
public:
Entry *next, *prev;
@@ -1231,7 +1231,7 @@ class UserMode
/** This class is a channel mode, all channel modes use this/inherit from this
*/
class ChannelMode
class CoreExport ChannelMode
{
public:
@@ -1264,7 +1264,7 @@ class ChannelMode
/** This is a mode for lists, eg b/e/I. These modes should inherit from this
*/
class ChannelModeList : public ChannelMode
class CoreExport ChannelModeList : public ChannelMode
{
public:
@@ -1302,7 +1302,7 @@ class ChannelModeList : public ChannelMode
/** This is a mode with a paramater, eg +k/l. These modes should use/inherit from this
*/
class ChannelModeParam : public ChannelMode
class CoreExport ChannelModeParam : public ChannelMode
{
public:
@@ -1332,7 +1332,7 @@ class ChannelModeParam : public ChannelMode
/** This is a mode that is a channel status, eg +v/h/o/a/q.
*/
class ChannelModeStatus : public ChannelMode
class CoreExport ChannelModeStatus : public ChannelMode
{
public:
/** CUS_ values, see below
@@ -1427,7 +1427,7 @@ class CoreExport ModeManager
/** Channel mode +b
*/
class ChannelModeBan : public ChannelModeList
class CoreExport ChannelModeBan : public ChannelModeList
{
public:
ChannelModeBan() : ChannelModeList(CMODE_BAN) { }
@@ -1439,7 +1439,7 @@ class ChannelModeBan : public ChannelModeList
/** Channel mode +e
*/
class ChannelModeExcept : public ChannelModeList
class CoreExport ChannelModeExcept : public ChannelModeList
{
public:
ChannelModeExcept() : ChannelModeList(CMODE_EXCEPT) { }
@@ -1451,7 +1451,7 @@ class ChannelModeExcept : public ChannelModeList
/** Channel mode +I
*/
class ChannelModeInvite : public ChannelModeList
class CoreExport ChannelModeInvite : public ChannelModeList
{
public:
ChannelModeInvite() : ChannelModeList(CMODE_INVITEOVERRIDE) { }
@@ -1463,7 +1463,7 @@ class ChannelModeInvite : public ChannelModeList
/** Channel mode +k (key)
*/
class ChannelModeKey : public ChannelModeParam
class CoreExport ChannelModeKey : public ChannelModeParam
{
public:
ChannelModeKey() : ChannelModeParam(CMODE_KEY) { }
@@ -1484,7 +1484,7 @@ class ChannelModeFlood : public ChannelModeParam
/** This class is used for channel mode +A (Admin only)
* Only opers can mlock it
*/
class ChannelModeAdmin : public ChannelMode
class CoreExport ChannelModeAdmin : public ChannelMode
{
public:
ChannelModeAdmin() : ChannelMode(CMODE_ADMINONLY) { }
@@ -1496,7 +1496,7 @@ class ChannelModeAdmin : public ChannelMode
/** This class is used for channel mode +O (Opers only)
* Only opers can mlock it
*/
class ChannelModeOper : public ChannelMode
class CoreExport ChannelModeOper : public ChannelMode
{
public:
ChannelModeOper() : ChannelMode(CMODE_OPERONLY) { }
@@ -1508,7 +1508,7 @@ class ChannelModeOper : public ChannelMode
/** This class is used for channel mode +r (registered channel)
* No one may mlock r
*/
class ChannelModeRegistered : public ChannelMode
class CoreExport ChannelModeRegistered : public ChannelMode
{
public:
ChannelModeRegistered() : ChannelMode(CMODE_REGISTERED) { }
@@ -1741,7 +1741,7 @@ class CoreExport IRCDProto
virtual void SetAutoIdentificationToken(User *u) { }
};
class CoreExport IRCDTS6Proto : public IRCDProto
class IRCDTS6Proto : public IRCDProto
{
};
@@ -1764,7 +1764,7 @@ struct Uplink {
}
};
class Anope
class CoreExport Anope
{
public:
/** Check whether two strings match.
@@ -1772,7 +1772,7 @@ class Anope
* @param str The string to check against the pattern (e.g. foobar)
* @param case_sensitive Whether or not the match is case sensitive, default false.
*/
CoreExport static bool Match(const std::string &str, const std::string &mask, bool case_sensitive = false);
static bool Match(const std::string &str, const std::string &mask, bool case_sensitive = false);
};
/*************************************************************************/