Fixed more warnings, rolled back some regex changes that seem to be causing problems on 64-bit platforms.

[SVN r14063]
This commit is contained in:
John Maddock
2002-05-30 11:07:05 +00:00
parent bbbd65c2e4
commit 53de3c4ae6
4 changed files with 46 additions and 16 deletions

View File

@ -40,10 +40,10 @@ namespace boost{
template <class charT>
struct kmp_info
{
std::size_t size;
std::size_t len;
unsigned int size;
unsigned int len;
const charT* pstr;
std::ptrdiff_t kmp_next[1];
int kmp_next[1];
};
template <class charT, class Allocator>
@ -57,11 +57,11 @@ template <class iterator, class charT, class Trans, class Allocator>
kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans translate, const Allocator& a)
{
typedef typename boost::detail::rebind_allocator<char, Allocator>::type atype;
std::ptrdiff_t i, j, m;
int i, j, m;
i = 0;
m = boost::re_detail::distance(first, last);
m = static_cast<int>(boost::re_detail::distance(first, last));
++m;
std::size_t size = sizeof(kmp_info<charT>) + sizeof(int)*m + sizeof(charT)*m;
unsigned int size = sizeof(kmp_info<charT>) + sizeof(int)*m + sizeof(charT)*m;
--m;
//
// allocate struct and fill it in:
@ -109,6 +109,3 @@ kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans transla