Quickbook: Merge from trunk to quickbook-dev.

[SVN r75846]
This commit is contained in:
Daniel James
2011-12-07 09:40:30 +00:00
parent 0ff14c8595
commit 82d366cfb4

View File

@@ -17,7 +17,8 @@
// enhanced with contributions from Terje Slettebo,
// with additional fixes and suggestions from Gennaro Prota,
// Beman Dawes, Dave Abrahams, Daryle Walker, Peter Dimov,
// Alexander Nasonov, Antony Polukhin and other Boosters
// Alexander Nasonov, Antony Polukhin, Justin Viiret, Michael Hofmann
// and other Boosters
// when: November 2000, March 2003, June 2005, June 2006, March 2011
#include <climits>
@@ -47,8 +48,9 @@
#include <boost/detail/lcast_precision.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/container/container_fwd.hpp>
#ifndef BOOST_NO_CWCHAR
# include <cwchar>
#endif
#ifndef BOOST_NO_STD_LOCALE
# include <locale>
@@ -682,8 +684,8 @@ namespace boost
, const CharT opening_brace, const CharT closing_brace)
{
using namespace std;
const wchar_t minus = lcast_char_constants<wchar_t>::minus;
const wchar_t plus = lcast_char_constants<wchar_t>::plus;
const CharT minus = lcast_char_constants<CharT>::minus;
const CharT plus = lcast_char_constants<CharT>::plus;
const int inifinity_size = 8;
bool has_minus = false;