projects
/
platform
/
upstream
/
boost.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.57.0
[platform/upstream/boost.git]
/
boost
/
regex
/
v4
/
perl_matcher.hpp
diff --git
a/boost/regex/v4/perl_matcher.hpp
b/boost/regex/v4/perl_matcher.hpp
index
ddaafbd
..
0a37a84
100644
(file)
--- a/
boost/regex/v4/perl_matcher.hpp
+++ b/
boost/regex/v4/perl_matcher.hpp
@@
-86,7
+86,6
@@
inline bool can_start(unsigned int c, const unsigned char* map, unsigned char ma
// which succeeds when it should not.
//
#ifndef _RWSTD_VER
// which succeeds when it should not.
//
#ifndef _RWSTD_VER
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
template <class C, class T, class A>
inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
{
template <class C, class T, class A>
inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
{
@@
-97,9
+96,7
@@
inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
}
return s.compare(p);
}
}
return s.compare(p);
}
-#endif
#else
#else
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
template <class C, class T, class A>
inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
{
template <class C, class T, class A>
inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
{
@@
-110,7
+107,6
@@
inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
}
return s.compare(p);
}
}
return s.compare(p);
}
-#endif
inline int string_compare(const std::string& s, const char* p)
{ return std::strcmp(s.c_str(), p); }
# ifndef BOOST_NO_WREGEX
inline int string_compare(const std::string& s, const char* p)
{ return std::strcmp(s.c_str(), p); }
# ifndef BOOST_NO_WREGEX