hopefully fix tex2lyx linking.

[lyx.git] / src / client / client.C

diff --git a/src/client/client.C b/src/client/client.C
index 5cfad794c8ae65042718d5ab89de1a9f5f96845b..424f78623480d7588b0e1811514e441207b5e575 100644 (file)
--- a/src/client/client.C
+++ b/src/client/client.C
@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "debug.h"
+#include "support/unicode.h"
 #include "support/lstrings.h"
 
 #include <boost/filesystem/operations.hpp>
@@ -53,6 +54,9 @@
 #include <map>
 #include <iostream>
 
+
+namespace lyx {
+
 using lyx::support::prefixIs;
 
 using boost::scoped_ptr;
@@ -66,6 +70,13 @@ using std::cin;
 using std::endl;
 
 
+IconvProcessor & utf8ToUcs4()
+{
+       static IconvProcessor iconv(ucs4_codeset, "UTF-8");
+       return iconv;
+}
+
+
 namespace support {
 
 string itoa(unsigned int i)
@@ -495,12 +506,12 @@ int p(vector<char *> const & arg)
 
 } // namespace cmdline
 
-
-
+} // namespace lyx
 
 
 int main(int argc, char * argv[])
 {
+       using namespace lyx;
        lyxerr.rdbuf(cerr.rdbuf());
 
        CmdLineParser args;
@@ -610,3 +621,15 @@ int main(int argc, char * argv[])
 
        return EXIT_SUCCESS;
 }
+
+
+namespace boost {
+
+void assertion_failed(char const* a, char const* b, char const* c, long d)
+{
+       lyx::lyxerr << "Assertion failed: " << a << ' ' << b << ' ' << c << ' '
+               << d << '\n';
+}
+
+} // namespace boost
+