Remove unused macros USE_INCLUDED_STRING and STD_STRING_IS_GOOD

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

diff --git a/src/support/convert.h b/src/support/convert.h
index da1947b843ad25c67213827f707f593737a240f4..2fed4eafdf14d23cae28dae6f08fef09183d6eb2 100644 (file)
--- a/src/support/convert.h
+++ b/src/support/convert.h
@@ -16,21 +16,35 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#if 0
-#include <boost/static_assert.hpp>
+#include "support/strfwd.h"
+
+namespace lyx {
 
-// Commented out since BOOST_STATIC_ASSERT does not work with gcc 4.0
-template <class Target, class Source>
-Target convert(Source arg)
-{
-       // We use a static assert here since we want all instances of
-       // this template to be specializations.
-       BOOST_STATIC_ASSERT(sizeof(bool) == 0);
-       return Target();
-}
-#else
 template <class Target, class Source>
 Target convert(Source arg);
-#endif
+
+
+template<> std::string convert<std::string>(bool b);
+template<> std::string convert<std::string>(char c);
+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<docstring>(unsigned int ui);
+template<> std::string convert<std::string>(unsigned long ul);
+template<> docstring convert<docstring>(unsigned long ul);
+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);
+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);
+
+} // namespace lyx
 
 #endif