From 0887b49c1bb46ac30e778612ef3a8a0278aea5a7 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Mon, 31 Jul 2006 23:46:20 +0000 Subject: [PATCH] move string constants into XMLStorage namespace svn path=/trunk/; revision=23399 --- reactos/base/applications/ibrowser/utility/xmlstorage.cpp | 6 +++--- reactos/base/shell/explorer/utility/xmlstorage.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/ibrowser/utility/xmlstorage.cpp b/reactos/base/applications/ibrowser/utility/xmlstorage.cpp index 7ebfdae8b89..5b977a6bfb1 100644 --- a/reactos/base/applications/ibrowser/utility/xmlstorage.cpp +++ b/reactos/base/applications/ibrowser/utility/xmlstorage.cpp @@ -44,6 +44,9 @@ #include +namespace XMLStorage { + + // work around GCC's wide string constant bug #ifdef __GNUC__ const LPCXSSTR XMLStorage::XS_EMPTY = XS_EMPTY_STR; @@ -54,9 +57,6 @@ const LPCXSSTR XMLStorage::XS_FLOATFMT = XS_FLOATFMT_STR; #endif -namespace XMLStorage { - - /// remove escape characters from zero terminated string static std::string unescape(const char* s, char b, char e) { diff --git a/reactos/base/shell/explorer/utility/xmlstorage.cpp b/reactos/base/shell/explorer/utility/xmlstorage.cpp index 7ebfdae8b89..5b977a6bfb1 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.cpp +++ b/reactos/base/shell/explorer/utility/xmlstorage.cpp @@ -44,6 +44,9 @@ #include +namespace XMLStorage { + + // work around GCC's wide string constant bug #ifdef __GNUC__ const LPCXSSTR XMLStorage::XS_EMPTY = XS_EMPTY_STR; @@ -54,9 +57,6 @@ const LPCXSSTR XMLStorage::XS_FLOATFMT = XS_FLOATFMT_STR; #endif -namespace XMLStorage { - - /// remove escape characters from zero terminated string static std::string unescape(const char* s, char b, char e) {