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

Merge pull request #92 from QUSpilPrgm/master

Browse Source 
Do not assume that fclose can be converted to int(*)(FILE*)
This commit is contained in:
Arseny Kapoulkine 2016-04-03 13:27:12 -07:00
commit 54f87d3b59
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pugixml.cpp
View File

@ -255,6 +255,13 @@ PUGI__NS_BEGIN
return result; return result;
} }
}; };
// Do not assume that fclose can be converted to int(*)(FILE*) because some
// compilers use a special calling convention for stdlib functions like fclose
PUGI__FN void auto_deleter_fclose(FILE* File)
{
fclose(File);
}
PUGI__NS_END PUGI__NS_END
#ifdef PUGIXML_COMPACT #ifdef PUGIXML_COMPACT
@ -6865,8 +6872,7 @@ namespace pugi
reset(); reset();
using impl::auto_deleter; // MSVC7 workaround using impl::auto_deleter; // MSVC7 workaround
typedef int (*fclose_t)(FILE*); // BCC5 workaround auto_deleter<FILE> file(fopen(path_, "rb"), impl::auto_deleter_fclose);
auto_deleter<FILE, fclose_t> file(fopen(path_, "rb"), fclose);
return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer); return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
} }
@ -6876,8 +6882,7 @@ namespace pugi
reset(); reset();
using impl::auto_deleter; // MSVC7 workaround using impl::auto_deleter; // MSVC7 workaround
typedef int (*fclose_t)(FILE*); // BCC5 workaround auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::auto_deleter_fclose);
auto_deleter<FILE, fclose_t> file(impl::open_file_wide(path_, L"rb"), fclose);
return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer); return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
} }
@ -6950,8 +6955,7 @@ namespace pugi
PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
{ {
using impl::auto_deleter; // MSVC7 workaround using impl::auto_deleter; // MSVC7 workaround
typedef int (*fclose_t)(FILE*); // BCC5 workaround auto_deleter<FILE> file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::auto_deleter_fclose);
auto_deleter<FILE, fclose_t> file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), fclose);
return impl::save_file_impl(*this, file.data, indent, flags, encoding); return impl::save_file_impl(*this, file.data, indent, flags, encoding);
} }
@ -6959,8 +6963,7 @@ namespace pugi
PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
{ {
using impl::auto_deleter; // MSVC7 workaround using impl::auto_deleter; // MSVC7 workaround
typedef int (*fclose_t)(FILE*); // BCC5 workaround auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::auto_deleter_fclose);
auto_deleter<FILE, fclose_t> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), fclose);
return impl::save_file_impl(*this, file.data, indent, flags, encoding); return impl::save_file_impl(*this, file.data, indent, flags, encoding);
} }