Handle properly exception that can be thrown by to_local8bit

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

diff --git a/src/support/convert.h b/src/support/convert.h
index eb51d77c838b842ef46712126e466ba0dc7b0bb2..fb069c98c312bf7a6a39da7740b414e5e11873c7 100644 (file)
--- a/src/support/convert.h
+++ b/src/support/convert.h
@@ -4,8 +4,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
- * \author Lars Gullik Bjønnes
+ * \author André Pönitz
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -16,7 +16,7 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -30,18 +30,26 @@ template<> std::string convert<std::string>(short unsigned int sui);
 template<> std::string convert<std::string>(int i);
 template<> docstring convert<docstring>(int i);
 template<> std::string convert<std::string>(unsigned int ui);
-template<> docstring convert<lyx::docstring>(unsigned int ui);
+template<> docstring convert<docstring>(unsigned int ui);
 template<> std::string convert<std::string>(unsigned long ul);
-template<> docstring convert<lyx::docstring>(unsigned long ul);
+template<> docstring convert<docstring>(unsigned long ul);
+#ifdef LYX_USE_LONG_LONG
+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<lyx::docstring>(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);
+#endif
 template<> std::string convert<std::string>(float f);
 template<> std::string convert<std::string>(double d);
-template<> int convert<int>(std::string const s);
-template<> int convert<int>(lyx::docstring const s);
-template<> unsigned int convert<unsigned int>(std::string const s);
-template<> unsigned long convert<unsigned long>(std::string const s);
-template<> double convert<double>(std::string const s);
+template<> int convert<int>(std::string const & s);
+template<> int convert<int>(docstring const & s);
+template<> unsigned int convert<unsigned int>(std::string const & s);
+template<> unsigned long convert<unsigned long>(std::string const & s);
+template<> double convert<double>(std::string const & s);
 template<> int convert<int>(char const * cptr);
 template<> double convert<double>(char const * cptr);