External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use global no-deprecate switch for newer GCC/MinGW, fixed warnings because of deprecation

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@390 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-05-08 20:36:20 +00:00
parent 6706a3f8ba
commit 8b6be5c02e
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jamrules.jam
View File

@ -12,7 +12,12 @@ if ( $(toolset:I=^mingw) || $(toolset) = "gcc" )
} }
CCFLAGS += -D$(defines) ; CCFLAGS += -D$(defines) ;
if ( $(toolset:I=^mingw3) )
{
# GCC3 does not have pragma diagnostic
CCFLAGS += -Wno-deprecated-declarations ; CCFLAGS += -Wno-deprecated-declarations ;
}
if ( $(configuration) = "debug" ) if ( $(configuration) = "debug" )
{ {

2
src/pugixml.cpp
View File

@ -1504,7 +1504,7 @@ namespace
strconv_attribute_t get_strconv_attribute(unsigned int optmask) strconv_attribute_t get_strconv_attribute(unsigned int optmask)
{ {
STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wnorm_attribute == 0x40 && parse_wconv_attribute == 0x80); STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x80);
switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes) switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes)
{ {

6
tests/test_deprecated.cpp
View File

@ -13,6 +13,12 @@
# pragma warning(disable: 4996) # pragma warning(disable: 4996)
#endif #endif
#ifdef __GNUC__
# if __GNUC__ >= 4
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# endif
#endif
// format_write_bom_utf8 - it's now format_write_bom! // format_write_bom_utf8 - it's now format_write_bom!
TEST_XML(document_save_bom_utf8, "<node/>") TEST_XML(document_save_bom_utf8, "<node/>")
{ {