forked from pool/boost
114 lines
4.2 KiB
Diff
114 lines
4.2 KiB
Diff
--- tools/wave/cpp.cpp.orig 2005-05-16 11:36:01.000000000 +0200
|
|
+++ tools/wave/cpp.cpp 2006-05-11 16:14:31.000000000 +0200
|
|
@@ -108,7 +108,7 @@
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// forward declarations only
|
|
-namespace cmd_line_utils
|
|
+namespace cmd_line_util
|
|
{
|
|
class include_paths;
|
|
}
|
|
@@ -116,7 +116,7 @@
|
|
namespace boost { namespace program_options
|
|
{
|
|
void validate(boost::any &v, std::vector<std::string> const &s,
|
|
- cmd_line_utils::include_paths *, int);
|
|
+ cmd_line_util::include_paths *, long);
|
|
}} // boost::program_options
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
@@ -234,7 +234,7 @@
|
|
namespace boost { namespace program_options {
|
|
|
|
void validate(boost::any &v, std::vector<std::string> const &s,
|
|
- cmd_line_util::include_paths *, int)
|
|
+ cmd_line_util::include_paths *, long)
|
|
{
|
|
cmd_line_util::include_paths::validate(v, s);
|
|
}
|
|
--- libs/wave/src/cpplexer/re2clex/aq.cpp.orig 2006-05-11 20:21:26.000000000 +0200
|
|
+++ libs/wave/src/cpplexer/re2clex/aq.cpp 2006-05-11 20:21:33.000000000 +0200
|
|
@@ -51,7 +51,7 @@
|
|
if (q->tail <= q->head) /* tail has wrapped around */
|
|
{
|
|
/* move the tail from the beginning to the end */
|
|
- memcpy(q->queue + q->max_size, q->queue,
|
|
+ memmove(q->queue + q->max_size, q->queue,
|
|
(q->tail + 1) * sizeof(aq_stdelement));
|
|
q->tail += q->max_size;
|
|
}
|
|
--- ./libs/regex/src/regex_raw_buffer.cpp.orig 2006-05-11 20:27:09.000000000 +0200
|
|
+++ ./libs/regex/src/regex_raw_buffer.cpp 2006-05-11 20:27:17.000000000 +0200
|
|
@@ -45,7 +45,7 @@
|
|
// allocate and copy data:
|
|
register pointer ptr = static_cast<pointer>(::operator new(newsize));
|
|
BOOST_REGEX_NOEH_ASSERT(ptr)
|
|
- std::memcpy(ptr, start, datasize);
|
|
+ std::memmove(ptr, start, datasize);
|
|
|
|
// get rid of old buffer:
|
|
::operator delete(start);
|
|
--- ./boost/wave/util/flex_string.hpp.orig 2006-05-11 20:39:21.000000000 +0200
|
|
+++ ./boost/wave/util/flex_string.hpp 2006-05-11 20:39:35.000000000 +0200
|
|
@@ -123,7 +123,7 @@
|
|
{
|
|
const std::size_t s = e - b;
|
|
using namespace std;
|
|
- memcpy(d, b, s * sizeof(*b));
|
|
+ memmove(d, b, s * sizeof(*b));
|
|
return d + s;
|
|
}
|
|
|
|
--- libs/wave/src/cpplexer/re2clex/cpp_re.cpp.orig 2006-05-12 17:41:15.000000000 +0200
|
|
+++ libs/wave/src/cpplexer/re2clex/cpp_re.cpp 2006-05-12 17:42:05.000000000 +0200
|
|
@@ -187,7 +187,7 @@
|
|
{
|
|
if (NULL == s->lim)
|
|
s->lim = s->top;
|
|
- memcpy(s->bot, s->tok, s->lim - s->tok);
|
|
+ memmove(s->bot, s->tok, s->lim - s->tok);
|
|
s->tok = s->bot;
|
|
s->ptr -= cnt;
|
|
cursor -= cnt;
|
|
@@ -211,7 +211,7 @@
|
|
return cursor;
|
|
}
|
|
|
|
- memcpy(buf, s->tok, s->lim - s->tok);
|
|
+ memmove(buf, s->tok, s->lim - s->tok);
|
|
s->tok = buf;
|
|
s->ptr = &buf[s->ptr - s->bot];
|
|
cursor = &buf[cursor - s->bot];
|
|
@@ -231,7 +231,7 @@
|
|
cnt = s->last - s->act;
|
|
if (cnt > BSIZE)
|
|
cnt = BSIZE;
|
|
- memcpy(s->lim, s->act, cnt);
|
|
+ memmove(s->lim, s->act, cnt);
|
|
s->act += cnt;
|
|
if (cnt != BSIZE)
|
|
{
|
|
--- libs/wave/src/cpplexer/re2clex/cpp_re.cpp.orig 2006-05-15 13:29:00.000000000 +0200
|
|
+++ libs/wave/src/cpplexer/re2clex/cpp_re.cpp 2006-05-15 13:31:59.000000000 +0200
|
|
@@ -51,7 +50,7 @@
|
|
#define YYCURSOR cursor
|
|
#define YYLIMIT limit
|
|
#define YYMARKER marker
|
|
-#define YYFILL(n) {cursor = uchar_wrapper(fill(s, cursor), cursor.column);}
|
|
+#define YYFILL(n) {cursor = uchar_wrapper(fill(s, cursor), cursor.column); limit = uchar_wrapper (s->lim); }
|
|
|
|
//#define RET(i) {s->cur = cursor; return (i);}
|
|
#define RET(i) \
|
|
|
|
--- boost/wave/util/flex_string.hpp.orig 2007-05-12 11:54:54.000000000 +0200
|
|
+++ boost/wave/util/flex_string.hpp 2007-05-12 11:55:09.000000000 +0200
|
|
@@ -83,6 +83,7 @@
|
|
#include <limits>
|
|
#include <stdexcept>
|
|
#include <cstddef>
|
|
+#include <cstring>
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
namespace boost {
|