diff options
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/base64.cpp | 2 | ||||
-rw-r--r-- | src/utils/dtor.h | 8 | ||||
-rw-r--r-- | src/utils/strprintf.cpp | 1 | ||||
-rw-r--r-- | src/utils/xml.cpp | 2 | ||||
-rw-r--r-- | src/utils/xml.h | 4 |
5 files changed, 14 insertions, 3 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index 8cea60f9..9d8ba836 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -27,8 +27,8 @@ +----------------------------------------------------------------------+ */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "base64.h" diff --git a/src/utils/dtor.h b/src/utils/dtor.h index f7c790c6..514ea9e7 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -22,6 +22,7 @@ #ifndef _TMW_UTILS_DTOR_H #define _TMW_UTILS_DTOR_H +#include <algorithm> #include <functional> #include <utility> @@ -44,4 +45,11 @@ inline dtor<typename Cont::value_type> make_dtor(Cont const&) return dtor<typename Cont::value_type>(); } +template<typename Container> +inline void delete_all(Container &c) +{ + std::for_each(c.begin(), c.end(), make_dtor(c)); +} + + #endif diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp index c5d7a595..c532dd0d 100644 --- a/src/utils/strprintf.cpp +++ b/src/utils/strprintf.cpp @@ -45,3 +45,4 @@ std::string strprintf(char const *format, ...) delete [] buf2; return res; } + diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 47f1bd04..e511ced3 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -20,7 +20,9 @@ */ #include "xml.h" + #include "../log.h" + #include "../resources/resourcemanager.h" namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index 5a5c756b..9e691963 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -22,10 +22,10 @@ #ifndef _TMW_XML_H #define _TMW_XML_H -#include <libxml/tree.h> - #include <string> +#include <libxml/tree.h> + /** * XML helper functions. */ |