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

Merge branch 'master' into compact

Browse Source
This commit is contained in:
Arseny Kapoulkine 2014-11-27 00:25:16 -08:00
commit 93c3ab4649
7 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -12,8 +12,8 @@ pugixml is used by a lot of projects, both open-source and proprietary, for perf
Documentation for the current release of pugixml is available on-line as two separate documents: Documentation for the current release of pugixml is available on-line as two separate documents:
* [Quick-start guide](http://cdn.rawgit.com/zeux/pugixml/v1.4/docs/quickstart.html), that aims to provide enough information to start using the library; * [Quick-start guide](http://cdn.rawgit.com/zeux/pugixml/v1.5/docs/quickstart.html), that aims to provide enough information to start using the library;
* [Complete reference manual](http://cdn.rawgit.com/zeux/pugixml/v1.4/docs/manual.html), that describes all features of the library in detail. * [Complete reference manual](http://cdn.rawgit.com/zeux/pugixml/v1.5/docs/manual.html), that describes all features of the library in detail.
You’re advised to start with the quick-start guide; however, many important library features are either not described in it at all or only mentioned briefly; if you require more information you should read the complete manual. You’re advised to start with the quick-start guide; however, many important library features are either not described in it at all or only mentioned briefly; if you require more information you should read the complete manual.

2
docs/manual.html
View File

@ -184,7 +184,7 @@ pugixml
</div> </div>
</div></div> </div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr> <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"><p><small>Last revised: November 18, 2014 at 17:25:31 GMT</small></p></td> <td align="left"><p><small>Last revised: November 26, 2014 at 02:23:21 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td> <td align="right"><div class="copyright-footer"></div></td>
</tr></table> </tr></table>
<hr> <hr>

1
docs/manual.qbk
View File

@ -1922,6 +1922,7 @@ Major release, featuring a lot of performance improvements and some new features
* Bug fixes * Bug fixes
# Adjusted comment output to avoid malformed documents if the comment value contains "--" # Adjusted comment output to avoid malformed documents if the comment value contains "--"
# Fix XPath sorting for documents that were constructed using append_buffer # Fix XPath sorting for documents that were constructed using append_buffer
# Fix load_file for wide-character paths with non-ASCII characters in MinGW with C++11 mode enabled
[h5 27.02.2014 - version 1.4] [h5 27.02.2014 - version 1.4]

4
docs/manual/changes.html
View File

@ -126,6 +126,10 @@
<li class="listitem"> <li class="listitem">
Fix XPath sorting for documents that were constructed using append_buffer Fix XPath sorting for documents that were constructed using append_buffer
</li> </li>
<li class="listitem">
Fix load_file for wide-character paths with non-ASCII characters
in MinGW with C++11 mode enabled
</li>
</ol></div> </ol></div>
</li> </li>
</ul></div> </ul></div>

4
src/pugixml.cpp
View File

@ -4548,7 +4548,7 @@ PUGI__NS_BEGIN
_fseeki64(file, 0, SEEK_END); _fseeki64(file, 0, SEEK_END);
length_type length = _ftelli64(file); length_type length = _ftelli64(file);
_fseeki64(file, 0, SEEK_SET); _fseeki64(file, 0, SEEK_SET);
#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && !defined(__STRICT_ANSI__) #elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && !(defined(__STRICT_ANSI__) && __GNUC__ * 100 + __GNUC_MINOR__ <= 405)
// there are 64-bit versions of fseek/ftell, let's use them // there are 64-bit versions of fseek/ftell, let's use them
typedef off64_t length_type; typedef off64_t length_type;
@ -4793,7 +4793,7 @@ PUGI__NS_BEGIN
} }
#endif #endif
#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && !defined(__STRICT_ANSI__)) #if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && !(defined(__STRICT_ANSI__) && __GNUC__ * 100 + __GNUC_MINOR__ <= 405))
PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode) PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
{ {
return _wfopen(path, mode); return _wfopen(path, mode);

1
tests/data/тест.xml Normal file
View File

@ -0,0 +1 @@
<node/>

10
tests/test_document.cpp
View File

@ -323,6 +323,16 @@ TEST(document_load_file_wide_ascii)
CHECK_NODE(doc, STR("<node />")); CHECK_NODE(doc, STR("<node />"));
} }
#if !defined(__DMC__) && !defined(__MWERKS__) && !(defined(__MINGW32__) && defined(__STRICT_ANSI__) && __GNUC__ * 100 + __GNUC_MINOR__ <= 405)
TEST(document_load_file_wide_unicode)
{
pugi::xml_document doc;
CHECK(doc.load_file(L"tests/data/\x0442\x0435\x0441\x0442.xml"));
CHECK_NODE(doc, STR("<node />"));
}
#endif
TEST(document_load_file_wide_out_of_memory) TEST(document_load_file_wide_out_of_memory)
{ {
test_runner::_memory_fail_threshold = 1; test_runner::_memory_fail_threshold = 1;