Index: trunk/lttoolbox/lttoolbox/att_compiler.cc =================================================================== --- trunk/lttoolbox/lttoolbox/att_compiler.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/att_compiler.cc (revision 69701) @@ -19,6 +19,7 @@ #include #include #include +#include using namespace std; @@ -113,12 +114,12 @@ if (line.length() == 0 && first_line) { - cerr << "Error: empty file '" << file_name << "'." << endl; + wcerr << "Error: empty file '" << file_name << "'." << endl; exit(EXIT_FAILURE); } if (first_line && line.find(L"\t") == wstring::npos) { - cerr << "Error: invalid format '" << file_name << "'." << endl; + wcerr << "Error: invalid format '" << file_name << "'." << endl; exit(EXIT_FAILURE); } Index: trunk/lttoolbox/lttoolbox/buffer.h =================================================================== --- trunk/lttoolbox/lttoolbox/buffer.h (revision 69700) +++ trunk/lttoolbox/lttoolbox/buffer.h (revision 69701) @@ -75,7 +75,7 @@ { if(buf_size == 0) { - cerr << "Error: Cannot create empty buffer." << endl; + wcerr << "Error: Cannot create empty buffer." << endl; exit(EXIT_FAILURE); } buf = new T[buf_size]; Index: trunk/lttoolbox/lttoolbox/compiler.cc =================================================================== --- trunk/lttoolbox/lttoolbox/compiler.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/compiler.cc (revision 69701) @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -79,7 +80,7 @@ reader = xmlReaderForFile(fichero.c_str(), NULL, 0); if(reader == NULL) { - cerr << "Error: cannot open '" << fichero << "'." << endl; + wcerr << "Error: cannot open '" << fichero << "'." << endl; exit(EXIT_FAILURE); } int ret = xmlTextReaderRead(reader); @@ -98,7 +99,7 @@ reader = xmlReaderForFile(fichero.c_str(), NULL, 0); if(reader == NULL) { - cerr << "Error: Cannot open '" << fichero << "'." << endl; + wcerr << "Error: Cannot open '" << fichero << "'." << endl; exit(EXIT_FAILURE); } @@ -702,8 +703,8 @@ int ret = xmlTextReaderRead(reader); if(ret != 1) { - cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader); - cerr << L"): Parse error." << endl; + wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader); + wcerr << L"): Parse error." << endl; exit(EXIT_FAILURE); } wstring name = XMLParseUtil::towstring(xmlTextReaderConstName(reader)); Index: trunk/lttoolbox/lttoolbox/compression.cc =================================================================== --- trunk/lttoolbox/lttoolbox/compression.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/compression.cc (revision 69701) @@ -131,7 +131,7 @@ } else { - cerr << "Out of range: " << value << endl; + wcerr << "Out of range: " << value << endl; exit(EXIT_FAILURE); } } Index: trunk/lttoolbox/lttoolbox/expander.cc =================================================================== --- trunk/lttoolbox/lttoolbox/expander.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/expander.cc (revision 69701) @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -47,7 +48,7 @@ reader = xmlReaderForFile(fichero.c_str(), NULL, 0); if(reader == NULL) { - cerr << "Error: Cannot open '" << fichero << "'." << endl; + wcerr << "Error: Cannot open '" << fichero << "'." << endl; exit(EXIT_FAILURE); } Index: trunk/lttoolbox/lttoolbox/expander.h =================================================================== --- trunk/lttoolbox/lttoolbox/expander.h (revision 69700) +++ trunk/lttoolbox/lttoolbox/expander.h (revision 69701) @@ -18,6 +18,7 @@ #define _EXPANDER_ #include +#include #include #include Index: trunk/lttoolbox/lttoolbox/lt_comp.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_comp.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_comp.cc (revision 69701) @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -161,7 +162,7 @@ } else { - cerr << "Error: Cannot not open file '" << infile << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << infile << "'." << endl << endl; exit(EXIT_FAILURE); } initGenericErrorDefaultFunc(NULL); @@ -227,7 +228,7 @@ FILE *output = fopen(outfile.c_str(), "wb"); if(!output) { - cerr << "Error: Cannot open file '" << outfile << "'." << endl; + wcerr << "Error: Cannot open file '" << outfile << "'." << endl; exit(EXIT_FAILURE); } if(ttype == 'a') Index: trunk/lttoolbox/lttoolbox/lt_expand.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_expand.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_expand.cc (revision 69701) @@ -104,7 +104,7 @@ input = fopen(infile.c_str(), "rb"); if(input == NULL) { - cerr << "Error: Cannot open file '" << infile << "'." << endl; + wcerr << "Error: Cannot open file '" << infile << "'." << endl; exit(EXIT_FAILURE); } fclose(input); @@ -116,7 +116,7 @@ input = fopen(infile.c_str(), "rb"); if(input == NULL) { - cerr << "Error: Cannot open file '" << infile << "'." << endl; + wcerr << "Error: Cannot open file '" << infile << "'." << endl; exit(EXIT_FAILURE); } fclose(input); @@ -125,7 +125,7 @@ output = fopen(argv[argc-1], "wb"); if(output == NULL) { - cerr << "Error: Cannot open file '" << outfile << "'." << endl; + wcerr << "Error: Cannot open file '" << outfile << "'." << endl; exit(EXIT_FAILURE); } break; Index: trunk/lttoolbox/lttoolbox/lt_locale.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_locale.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_locale.cc (revision 69701) @@ -34,7 +34,7 @@ return; } - cerr << "Warning: unsupported locale, fallback to \"C\"" << endl; + wcerr << "Warning: unsupported locale, fallback to \"C\"" << endl; setlocale(LC_ALL, "C"); #endif Index: trunk/lttoolbox/lttoolbox/lt_print.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_print.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_print.cc (revision 69701) @@ -52,7 +52,7 @@ FILE *input = fopen(argv[1], "r"); if(!input) { - cerr << "Error: Cannot open file '" << argv[1] << "'." << endl; + wcerr << "Error: Cannot open file '" << argv[1] << "'." << endl; exit(EXIT_FAILURE); } Index: trunk/lttoolbox/lttoolbox/lt_proc.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_proc.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_proc.cc (revision 69701) @@ -183,7 +183,7 @@ FILE *in = fopen(argv[optind], "rb"); if(in == NULL || ferror(in)) { - cerr << "Error: Cannot not open file '" << argv[optind] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[optind] << "'." << endl << endl; exit(EXIT_FAILURE); } @@ -190,7 +190,7 @@ input = fopen(argv[optind+1], "rb"); if(input == NULL || ferror(input)) { - cerr << "Error: Cannot not open file '" << argv[optind+1] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[optind+1] << "'." << endl << endl; exit(EXIT_FAILURE); } @@ -197,7 +197,7 @@ output= fopen(argv[optind+2], "wb"); if(output == NULL || ferror(output)) { - cerr << "Error: Cannot not open file '" << argv[optind+2] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[optind+2] << "'." << endl << endl; exit(EXIT_FAILURE); } @@ -209,7 +209,7 @@ FILE *in = fopen(argv[optind], "rb"); if(in == NULL || ferror(in)) { - cerr << "Error: Cannot not open file '" << argv[optind] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[optind] << "'." << endl << endl; exit(EXIT_FAILURE); } @@ -216,7 +216,7 @@ input = fopen(argv[optind+1], "rb"); if(input == NULL || ferror(input)) { - cerr << "Error: Cannot not open file '" << argv[optind+1] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[optind+1] << "'." << endl << endl; exit(EXIT_FAILURE); } @@ -228,7 +228,7 @@ FILE *in = fopen(argv[optind], "rb"); if(in == NULL || ferror(in)) { - cerr << "Error: Cannot not open file '" << argv[optind] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[optind] << "'." << endl << endl; exit(EXIT_FAILURE); } fstp.load(in); @@ -325,7 +325,7 @@ } catch (exception& e) { - cerr << e.what(); + wcerr << e.what(); if (fstp.getNullFlush()) { fputwc_unlocked(L'\0', output); } Index: trunk/lttoolbox/lttoolbox/lt_tmxcomp.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_tmxcomp.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_tmxcomp.cc (revision 69701) @@ -130,7 +130,7 @@ FILE *output = fopen(argv[argc-1], "w"); if(!output) { - cerr << "Error: Cannot open file '" << argv[2] << "'." << endl; + wcerr << "Error: Cannot open file '" << argv[2] << "'." << endl; exit(EXIT_FAILURE); } c.write(output); Index: trunk/lttoolbox/lttoolbox/lt_trim.cc =================================================================== --- trunk/lttoolbox/lttoolbox/lt_trim.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/lt_trim.cc (revision 69701) @@ -155,13 +155,13 @@ FILE *analyser = fopen(argv[1], "rb"); if(!analyser) { - cerr << "Error: Cannot not open file '" << argv[1] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[1] << "'." << endl << endl; exit(EXIT_FAILURE); } FILE *bidix = fopen(argv[2], "rb"); if(!bidix) { - cerr << "Error: Cannot not open file '" << argv[2] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[2] << "'." << endl << endl; exit(EXIT_FAILURE); } @@ -189,7 +189,7 @@ FILE *output = fopen(argv[3], "wb"); if(!output) { - cerr << "Error: Cannot not open file '" << argv[3] << "'." << endl << endl; + wcerr << "Error: Cannot not open file '" << argv[3] << "'." << endl << endl; exit(EXIT_FAILURE); } Index: trunk/lttoolbox/lttoolbox/string_to_wostream.h =================================================================== --- trunk/lttoolbox/lttoolbox/string_to_wostream.h (nonexistent) +++ trunk/lttoolbox/lttoolbox/string_to_wostream.h (revision 69701) @@ -0,0 +1,15 @@ +// Include string_utils.h instead if you're linking against apertium + +#ifndef __STRING_TO_WOSTREAM_H_ +#define __STRING_TO_WOSTREAM_H_ + +#include + +static std::wostream & operator<<(std::wostream & ostr, std::string const & str) { + std::copy( + str.begin(), str.end(), + std::ostream_iterator(ostr)); + return ostr; +} + +#endif Index: trunk/lttoolbox/lttoolbox/tmx_compiler.cc =================================================================== --- trunk/lttoolbox/lttoolbox/tmx_compiler.cc (revision 69700) +++ trunk/lttoolbox/lttoolbox/tmx_compiler.cc (revision 69701) @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -62,7 +63,7 @@ reader = xmlReaderForFile(fichero.c_str(), NULL, 0); if(reader == NULL) { - cerr << "Error: Cannot open '" << fichero << "'." << endl; + wcerr << "Error: Cannot open '" << fichero << "'." << endl; exit(EXIT_FAILURE); } @@ -119,8 +120,8 @@ { if(!allBlanks()) { - cerr << "Error (" << xmlTextReaderGetParserLineNumber(reader); - cerr << "): Invalid construction." << endl; + wcerr << "Error (" << xmlTextReaderGetParserLineNumber(reader); + wcerr << "): Invalid construction." << endl; exit(EXIT_FAILURE); } } @@ -142,8 +143,8 @@ { if(!allBlanks()) { - cerr << "Error (" << xmlTextReaderGetParserLineNumber(reader); - cerr << "): Invalid construction." << endl; + wcerr << "Error (" << xmlTextReaderGetParserLineNumber(reader); + wcerr << "): Invalid construction." << endl; exit(EXIT_FAILURE); } }