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

Removed std::min from XPath (macro problems, it was needed only once anyway)

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@93 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2009-01-05 19:59:14 +00:00
parent 2c06637bf8
commit 3ba642468c
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pugixpath.cpp
View File

@ -30,17 +30,6 @@
# pragma warning(disable: 4996) // this function or variable may be unsafe # pragma warning(disable: 4996) // this function or variable may be unsafe
#endif #endif
#if defined(_MSC_VER) && _MSC_VER == 1200
// MSVC6 workaround
namespace std
{
template <typename T> const T& min(const T& a, const T& b)
{
return _cpp_min(a, b);
}
}
#endif
namespace namespace
{ {
using namespace pugi; using namespace pugi;
@ -2185,8 +2174,11 @@ namespace pugi
size_t pos = first < 1 ? 1 : (size_t)first; size_t pos = first < 1 ? 1 : (size_t)first;
size_t end = last >= s.length() + 1 ? s.length() + 1 : (size_t)last; size_t end = last >= s.length() + 1 ? s.length() + 1 : (size_t)last;
size_t size_requested = end - pos;
size_t size_to_end = s.length() - pos + 1;
return s.substr(pos - 1, std::min(end - pos, s.length() - pos + 1)); return s.substr(pos - 1, size_requested < size_to_end ? size_requested : size_to_end);
} }
case ast_func_normalize_space_0: case ast_func_normalize_space_0: