Compiler specific fixes and workarounds.

[SVN r27273]
This commit is contained in:
John Maddock
2005-02-09 13:16:39 +00:00
parent 2ee7ef601c
commit 077f211f2f
2 changed files with 8 additions and 3 deletions

View File

@ -127,8 +127,8 @@ int main(int argc, char * argv[])
p.add("input-file", -1); p.add("input-file", -1);
po::variables_map vm; po::variables_map vm;
store(po::command_line_parser(argc, argv).options(cmdline_options)/*.options(hidden)*/.positional(p).run(), vm); po::store(po::command_line_parser(argc, argv).options(cmdline_options)/*.options(hidden)*/.positional(p).run(), vm);
notify(vm); po::notify(vm);
if (vm.count("help")) if (vm.count("help"))
{ {

View File

@ -20,8 +20,13 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <cstring>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#ifdef BOOST_NO_STDC_NAMESPACE
namespace std{ using ::memmove; }
#endif
// match some kind of html tag: // match some kind of html tag:
boost::regex e("<[^>]*>"); boost::regex e("<[^>]*>");
// count how many: // count how many:
@ -53,7 +58,7 @@ void search(std::istream& is)
// and how much is left to fill: // and how much is left to fill:
unsigned size = next_pos - buf; unsigned size = next_pos - buf;
// copy forward whatever we have left: // copy forward whatever we have left:
memmove(buf, next_pos, leftover); std::memmove(buf, next_pos, leftover);
// fill the rest from the stream: // fill the rest from the stream:
is.read(buf + leftover, size); is.read(buf + leftover, size);
unsigned read = is.gcount(); unsigned read = is.gcount();