Replace std::deque with std::vector in spanningtree and related modules

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

diff --git a/include/inspstring.h b/include/inspstring.h
index 89abed94f4a8433498c2422fdb94810a97c3c5da..54bb1c8bd641927e0546b67dfae7b293f134cb28 100644 (file)
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -1 +1,57 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#ifndef __IN_INSPSTRING_H\r#define __IN_INSPSTRING_H\r\r#include "inspircd_config.h"\r#include <string.h>\r#include <cstddef>\r\r#ifndef HAS_STRLCPY\r/** strlcpy() implementation for systems that don't have it (linux) */\rCoreExport size_t strlcpy(char *dst, const char *src, size_t siz);\r/** strlcat() implementation for systems that don't have it (linux) */\rCoreExport size_t strlcat(char *dst, const char *src, size_t siz);\r#endif\r\r/** charlcat() will append one character to a string using the same\r * safety scemantics as strlcat().\r * @param x The string to operate on\r * @param y the character to append to the end of x\r * @param z The maximum allowed length for z including null terminator\r */\rCoreExport int charlcat(char* x,char y,int z);\r/** charremove() will remove all instances of a character from a string\r * @param mp The string to operate on\r * @param remove The character to remove\r */\rCoreExport bool charremove(char* mp, char remove);\r\r/** strnewdup() is an implemenetation of strdup() which calls operator new\r * rather than malloc to allocate the new string, therefore allowing it to\r * be hooked into the C++ memory manager, and freed with operator delete.\r * This is required for windows, where we override operators new and delete\r * to allow for global allocation between modules and the core.\r */\rinline char * strnewdup(const char * s1)\r{\r     size_t len = strlen(s1) + 1;\r   char * p = new char[len];\r      memcpy(p, s1, len);\r    return p;\r}\r\r#endif\r\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef __IN_INSPSTRING_H
+#define __IN_INSPSTRING_H
+
+// This (inspircd_config) is needed as inspstring doesn't pull in the central header
+#include "inspircd_config.h"
+#include <cstring>
+//#include <cstddef>
+
+#ifndef HAS_STRLCPY
+/** strlcpy() implementation for systems that don't have it (linux) */
+CoreExport size_t strlcpy(char *dst, const char *src, size_t siz);
+/** strlcat() implementation for systems that don't have it (linux) */
+CoreExport size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
+/** charlcat() will append one character to a string using the same
+ * safety scemantics as strlcat().
+ * @param x The string to operate on
+ * @param y the character to append to the end of x
+ * @param z The maximum allowed length for z including null terminator
+ */
+CoreExport int charlcat(char* x,char y,int z);
+/** charremove() will remove all instances of a character from a string
+ * @param mp The string to operate on
+ * @param remove The character to remove
+ */
+CoreExport bool charremove(char* mp, char remove);
+
+/** strnewdup() is an implemenetation of strdup() which calls operator new
+ * rather than malloc to allocate the new string, therefore allowing it to
+ * be hooked into the C++ memory manager, and freed with operator delete.
+ * This is required for windows, where we override operators new and delete
+ * to allow for global allocation between modules and the core.
+ */
+inline char * strnewdup(const char * s1)
+{
+       size_t len = strlen(s1) + 1;
+       char * p = new char[len];
+       memcpy(p, s1, len);
+       return p;
+}
+
+#endif
+