#include "support/convert.h"
#include "support/docstring.h"
-#include <boost/lexical_cast.hpp>
-
#include <string>
#include <sstream>
//needed for Mac OSX 10.5.2 Leopard
using namespace std;
-namespace {
-
-// A version of lexical cast that does not throw. Useful for when we convert to string
-template<typename To, typename From>
-To lexical_cast(From const & value, To const & defaultResult = To())
-{
- try {
- return boost::lexical_cast<To>(value);
- } catch(...) {
- // Ignore all exceptions and use default.
- return defaultResult;
- }
-}
-
-} // namespace
-
-
namespace lyx {
template<>
template<>
string convert<string>(short unsigned int sui)
{
- return lexical_cast<string>(sui);
+ return to_string(sui);
}
template<>
string convert<string>(int i)
{
- return lexical_cast<string>(i);
+ return to_string(i);
}
template<>
docstring convert<docstring>(int i)
{
- return from_ascii(lexical_cast<string>(i));
+ return from_ascii(to_string(i));
}
template<>
string convert<string>(unsigned int ui)
{
- return lexical_cast<string>(ui);
+ return to_string(ui);
}
template<>
docstring convert<docstring>(unsigned int ui)
{
- return from_ascii(lexical_cast<string>(ui));
+ return from_ascii(to_string(ui));
}
template<>
string convert<string>(unsigned long ul)
{
- return lexical_cast<string>(ul);
+ return to_string(ul);
}
template<>
docstring convert<docstring>(unsigned long ul)
{
- return from_ascii(lexical_cast<string>(ul));
+ return from_ascii(to_string(ul));
}
template<>
string convert<string>(unsigned long long ull)
{
- return lexical_cast<string>(ull);
+ return to_string(ull);
}
template<>
docstring convert<docstring>(unsigned long long ull)
{
- return from_ascii(lexical_cast<string>(ull));
+ return from_ascii(to_string(ull));
}
-#endif
template<>
-string convert<string>(long l)
+string convert<string>(long long ll)
{
- return lexical_cast<string>(l);
+ return to_string(ll);
}
template<>
-docstring convert<docstring>(long l)
+docstring convert<docstring>(long long ll)
{
- return from_ascii(lexical_cast<string>(l));
+ return from_ascii(to_string(ll));
}
-#ifdef HAVE_LONG_LONG_INT
template<>
-string convert<string>(long long ll)
+unsigned long long convert<unsigned long long>(string const s)
{
- return lexical_cast<string>(ll);
+ return strtoull(s.c_str(), nullptr, 10);
}
+/* not presently needed
template<>
-docstring convert<docstring>(long long ll)
+long long convert<long long>(string const s)
{
- return from_ascii(lexical_cast<string>(ll));
+ return strtoll(s.c_str(), nullptr, 10);
}
+*/
#endif
+template<>
+string convert<string>(long l)
+{
+ return to_string(l);
+}
+
+
+template<>
+docstring convert<docstring>(long l)
+{
+ return from_ascii(to_string(l));
+}
+
+
template<>
string convert<string>(float f)
{
- std::ostringstream val;
+ ostringstream val;
val << f;
return val.str();
}
template<>
string convert<string>(double d)
{
- std::ostringstream val;
+ ostringstream val;
val << d;
return val.str();
}
template<>
int convert<int>(string const s)
{
- return strtol(s.c_str(), 0, 10);
+ return int(strtol(s.c_str(), nullptr, 10));
+}
+
+
+int convert(string const & s, int base)
+{
+ return int(strtol(s.c_str(), nullptr, base));
}
template<>
int convert<int>(docstring const s)
{
- return strtol(to_ascii(s).c_str(), 0, 10);
+ return int(strtol(to_ascii(s).c_str(), nullptr, 10));
}
template<>
unsigned int convert<unsigned int>(string const s)
{
- return strtoul(s.c_str(), 0, 10);
+ return static_cast<unsigned int>(strtoul(s.c_str(), nullptr, 10));
}
template<>
unsigned long convert<unsigned long>(string const s)
{
- return strtoul(s.c_str(), 0, 10);
+ return strtoul(s.c_str(), nullptr, 10);
}
template<>
double convert<double>(string const s)
{
- return strtod(s.c_str(), 0);
+ return strtod(s.c_str(), nullptr);
}
template<>
int convert<int>(char const * cptr)
{
- return strtol(cptr, 0, 10);
+ return int(strtol(cptr, nullptr, 10));
}
template<>
double convert<double>(char const * cptr)
{
- return strtod(cptr, 0);
+ return strtod(cptr, nullptr);
}