diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-12-16 02:39:31 +0000 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-01-04 19:31:29 +0100 |
| commit | 428e8f4f693192a527065e5488bbc7fceb938b6f (patch) | |
| tree | 00dc71a91e49531e4c37c2c429ddc24db026780b /include | |
| parent | 57d02ca02e441971bf27fae2c2ba5302c60e43c9 (diff) | |
Fix some Windows-related problems.
- Fix an error relating to the unavailability of std::back_inserter.
- Fix loading configuration files when using relative paths.
- Fix two methods in hashcomp being exported twice.
- Remove some unimportant error messages.
Diffstat (limited to 'include')
| -rw-r--r-- | include/compat.h | 2 | ||||
| -rw-r--r-- | include/hashcomp.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/compat.h b/include/compat.h index 0357f5478..fa75cd754 100644 --- a/include/compat.h +++ b/include/compat.h @@ -41,7 +41,6 @@ #if defined __clang__ || defined __GNUC__ # define CUSTOM_PRINTF(stringpos, firstpos) __attribute__((format(printf, stringpos, firstpos))) #else -# pragma message ("Warning! CUSTOM_PRINTF() does not work on your compiler!") # define CUSTOM_PRINTF(stringpos, firstpos) #endif @@ -98,7 +97,6 @@ #elif defined _MSC_VER # define DEPRECATED_METHOD(function) __declspec(deprecated) function #else -# pragma message ("Warning! DEPRECATED_METHOD() does not work on your compiler!") # define DEPRECATED_METHOD(function) function #endif diff --git a/include/hashcomp.h b/include/hashcomp.h index ec1cc5764..0bf306267 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -148,7 +148,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 @@ -156,7 +156,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. |