From 337897784dcfb58c54b8dd8ebd563aa11706ab20 Mon Sep 17 00:00:00 2001 From: kannibalox Date: Fri, 1 Nov 2024 08:52:41 -0400 Subject: [PATCH] Change rpc namespace to include static consts --- src/rpc/tinyxml2/tinyxml2.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rpc/tinyxml2/tinyxml2.cpp b/src/rpc/tinyxml2/tinyxml2.cpp index 48a4f342..5ae5fa33 100644 --- a/src/rpc/tinyxml2/tinyxml2.cpp +++ b/src/rpc/tinyxml2/tinyxml2.cpp @@ -35,6 +35,8 @@ distribution. # include #endif +namespace rpc { // rpc is a rtorrent-specific namespace + #if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) // Microsoft Visual Studio, version 2005 and higher. Not WinCE. /*int _snprintf_s( @@ -133,7 +135,7 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; -namespace rpc::tinyxml2 // rpc is a rtorrent-specific namespace +namespace tinyxml2 { struct Entity { @@ -3027,5 +3029,7 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown ) return true; } -} // namespace rpc::tinyxml2 +} // namespace tinyxml2 + +} // namespace rpc #endif