Let paragraph::requestSpellcheck() consider contained insets

[lyx.git] / src / support / convert.h

diff --git a/src/support/convert.h b/src/support/convert.h
index fb069c98c312bf7a6a39da7740b414e5e11873c7..8061732dbe268793919f9ea4c4dd544c37cffa2c 100644 (file)
--- a/src/support/convert.h
+++ b/src/support/convert.h
@@ -33,16 +33,17 @@ template<> std::string convert<std::string>(unsigned int ui);
 template<> docstring convert<docstring>(unsigned int ui);
 template<> std::string convert<std::string>(unsigned long ul);
 template<> docstring convert<docstring>(unsigned long ul);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 template<> std::string convert<std::string>(unsigned long long ull);
 template<> docstring convert<docstring>(unsigned long long ull);
-#endif
-template<> std::string convert<std::string>(long l);
-template<> docstring convert<docstring>(long l);
-#ifdef LYX_USE_LONG_LONG
 template<> std::string convert<std::string>(long long ll);
 template<> docstring convert<docstring>(long long ll);
+template<> unsigned long long convert<unsigned long long>(std::string const & s);
+// not presently needed
+// template<> long long convert<long long>(std::string const & s);
 #endif
+template<> std::string convert<std::string>(long l);
+template<> docstring convert<docstring>(long l);
 template<> std::string convert<std::string>(float f);
 template<> std::string convert<std::string>(double d);
 template<> int convert<int>(std::string const & s);
@@ -53,6 +54,7 @@ template<> double convert<double>(std::string const & s);
 template<> int convert<int>(char const * cptr);
 template<> double convert<double>(char const * cptr);
 
+int convert(std::string const & s, int base);
 } // namespace lyx
 
 #endif