mirror of
https://github.com/boostorg/regex.git
synced 2025-07-12 11:56:37 +02:00
More fixes resulting from the new config
[SVN r11182]
This commit is contained in:
@ -35,9 +35,10 @@
|
|||||||
#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
|
#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
|
||||||
|
|
||||||
//
|
//
|
||||||
// VC6 needs to link to user32.lib:
|
// VC6 needs to link to user32.lib, as do all compilers that
|
||||||
|
// claim to be VC6/7 compatible:
|
||||||
//
|
//
|
||||||
#ifdef BOOST_MSVC
|
#if defined(_MSC_VER) && !defined(__BORLANDC__)
|
||||||
#pragma comment(lib, "user32.lib")
|
#pragma comment(lib, "user32.lib")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -162,10 +162,10 @@ public:
|
|||||||
{ return size_t(-1) / sizeof(value_type); }
|
{ return size_t(-1) / sizeof(value_type); }
|
||||||
|
|
||||||
void construct(pointer p, const T& val) const
|
void construct(pointer p, const T& val) const
|
||||||
{ allocator_construct(p, val); }
|
{ boost::detail::allocator_construct(p, val); }
|
||||||
|
|
||||||
void destroy(pointer __p) const
|
void destroy(pointer p) const
|
||||||
{ allocator_destroy(p); }
|
{ boost::detail::allocator_destroy(p); }
|
||||||
|
|
||||||
#ifndef BOOST_NO_MEMBER_TEMPLATES
|
#ifndef BOOST_NO_MEMBER_TEMPLATES
|
||||||
template <class U>
|
template <class U>
|
||||||
@ -229,12 +229,10 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void construct(pointer , const char& )
|
static void construct(pointer , const char& )
|
||||||
{
|
{ boost::detail::allocator_construct(p, val); }
|
||||||
}
|
|
||||||
|
|
||||||
static void destroy(pointer )
|
static void destroy(pointer )
|
||||||
{
|
{ boost::detail::allocator_destroy(p); }
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
Reference in New Issue
Block a user