[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot/dic compdic.cpp encoding.cpp
From: |
Olivier Teulière |
Subject: |
[Eliot-dev] eliot/dic compdic.cpp encoding.cpp |
Date: |
Sat, 28 Feb 2009 09:23:07 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 09/02/28 09:23:07
Modified files:
dic : compdic.cpp encoding.cpp
Log message:
- Fixed some warnings on Windows build
- Open the dictionary in binary mode. This fixes a bug in the Windows
version of compdic
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/compdic.cpp?cvsroot=eliot&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/encoding.cpp?cvsroot=eliot&r1=1.6&r2=1.7
Patches:
Index: compdic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/compdic.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- compdic.cpp 22 Nov 2008 13:09:28 -0000 1.7
+++ compdic.cpp 28 Feb 2009 09:23:07 -0000 1.8
@@ -76,7 +76,7 @@
const wchar_t* load_uncompressed(const string &iFileName, unsigned int
&ioDicSize)
{
- ifstream file(iFileName.c_str());
+ ifstream file(iFileName.c_str(), ios::in | ios::binary);
if (!file.is_open())
throw DicException("Could not open file " + iFileName);
@@ -578,6 +578,5 @@
cerr << e.what() << endl;
return 1;
}
-
}
Index: encoding.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/encoding.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- encoding.cpp 22 Nov 2008 13:09:28 -0000 1.6
+++ encoding.cpp 28 Feb 2009 09:23:07 -0000 1.7
@@ -85,6 +85,7 @@
va_start(argp, format);
#ifdef WIN32
// Mingw32 does not take the maxlen argument
+ (void)maxlen;
res = vswprintf(wcs, format, argp);
#else
res = vswprintf(wcs, maxlen, format, argp);
@@ -98,6 +99,7 @@
{
#ifdef WIN32
// Mingw32 does not take the third argument
+ (void)ptr;
return wcstok(wcs, delim);
#else
return wcstok(wcs, delim, ptr);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot/dic compdic.cpp encoding.cpp,
Olivier Teulière <=