[sword-svn] r2562 - trunk/utilities
chrislit at crosswire.org
chrislit at crosswire.org
Mon Oct 4 01:35:09 MST 2010
Author: chrislit
Date: 2010-10-04 01:35:09 -0700 (Mon, 04 Oct 2010)
New Revision: 2562
Modified:
trunk/utilities/addgb.cpp
trunk/utilities/addld.cpp
trunk/utilities/addvs.cpp
trunk/utilities/cipherraw.cpp
trunk/utilities/emptyvss.cpp
trunk/utilities/genbookutil.cpp
trunk/utilities/imp2gbs.cpp
trunk/utilities/imp2ld.cpp
trunk/utilities/imp2vs.cpp
trunk/utilities/installmgr.cpp
trunk/utilities/mkfastmod.cpp
trunk/utilities/mod2imp.cpp
trunk/utilities/mod2osis.cpp
trunk/utilities/mod2vpl.cpp
trunk/utilities/mod2zmod.cpp
trunk/utilities/modwrite.cpp
trunk/utilities/osis2mod.cpp
trunk/utilities/step2vpl.cpp
trunk/utilities/stepdump.cpp
trunk/utilities/tei2mod.cpp
trunk/utilities/treeidxutil.cpp
trunk/utilities/vpl2mod.cpp
trunk/utilities/vs2osisref.cpp
trunk/utilities/vs2osisreftxt.cpp
trunk/utilities/xml2gbs.cpp
Log:
eliminated some VC++ warnings
Modified: trunk/utilities/addgb.cpp
===================================================================
--- trunk/utilities/addgb.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/addgb.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -14,6 +14,11 @@
* General Public License for more details.
*
*/
+
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trunk/utilities/addld.cpp
===================================================================
--- trunk/utilities/addld.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/addld.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trunk/utilities/addvs.cpp
===================================================================
--- trunk/utilities/addvs.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/addvs.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trunk/utilities/cipherraw.cpp
===================================================================
--- trunk/utilities/cipherraw.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/cipherraw.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trunk/utilities/emptyvss.cpp
===================================================================
--- trunk/utilities/emptyvss.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/emptyvss.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <swmgr.h>
#include <swmodule.h>
#include <versekey.h>
Modified: trunk/utilities/genbookutil.cpp
===================================================================
--- trunk/utilities/genbookutil.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/genbookutil.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,11 +15,16 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <entriesblk.h>
#include <iostream>
#include <stdio.h>
#include <treekeyidx.h>
#include <rawgenbook.h>
+
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
Modified: trunk/utilities/imp2gbs.cpp
===================================================================
--- trunk/utilities/imp2gbs.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/imp2gbs.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
@@ -30,17 +34,13 @@
#include <stringmgr.h>
#ifdef _ICU_
-
#include <unicode/utypes.h>
#include <unicode/ucnv.h>
#include <unicode/ustring.h>
#include <unicode/uchar.h>
-
#include <unicode/unistr.h>
#include <unicode/translit.h>
-
#include <unicode/locid.h>
-
#endif
#ifndef NO_SWORD_NAMESPACE
@@ -239,7 +239,7 @@
bool more = true;
do {
- more = FileMgr::getLine(fd, lineBuffer);
+ more = FileMgr::getLine(fd, lineBuffer)!=0;
if (lineBuffer.startsWith("$$$")) {
if ((keyBuffer.size()) && (entBuffer.size())) {
writeEntry(book, keyBuffer, entBuffer);
Modified: trunk/utilities/imp2ld.cpp
===================================================================
--- trunk/utilities/imp2ld.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/imp2ld.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <string>
#include <vector>
#include <fstream>
@@ -28,9 +32,7 @@
using std::string;
#ifndef NO_SWORD_NAMESPACE
-
using namespace sword;
-
#endif
Modified: trunk/utilities/imp2vs.cpp
===================================================================
--- trunk/utilities/imp2vs.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/imp2vs.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <stdio.h>
#include <iostream>
Modified: trunk/utilities/installmgr.cpp
===================================================================
--- trunk/utilities/installmgr.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/installmgr.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <swmgr.h>
#include <installmgr.h>
#include <ftptrans.h>
@@ -78,7 +82,7 @@
class MyStatusReporter : public StatusReporter {
int last;
virtual void statusUpdate(double dltotal, double dlnow) {
- int p = 74 * (dlnow / dltotal);
+ int p = 74 * (int)(dlnow / dltotal);
for (;last < p; ++last) {
if (!last) {
SWBuf output;
@@ -97,7 +101,7 @@
while (output.size() < 75) output += " ";
output += "]";
cout << "\n" << output.c_str() << "\n ";
- int p = 74 * ((double)completedBytes/totalBytes);
+ int p = 74 * (int)((double)completedBytes/totalBytes);
for (int i = 0; i < p; ++i) { cout << "="; }
cout << "\n\n" << message << "\n";
last = 0;
Modified: trunk/utilities/mkfastmod.cpp
===================================================================
--- trunk/utilities/mkfastmod.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/mkfastmod.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <stdio.h>
#include <rawtext.h>
#include <swmgr.h>
@@ -22,7 +26,6 @@
#include <markupfiltmgr.h>
#include <swbuf.h>
-
#ifndef NO_SWORD_NAMESPACE
using sword::SWMgr;
using sword::SWModule;
Modified: trunk/utilities/mod2imp.cpp
===================================================================
--- trunk/utilities/mod2imp.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/mod2imp.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <iostream>
#include <map>
#include <stdio.h>
Modified: trunk/utilities/mod2osis.cpp
===================================================================
--- trunk/utilities/mod2osis.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/mod2osis.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <fcntl.h>
#include <iostream>
#include <fstream>
Modified: trunk/utilities/mod2vpl.cpp
===================================================================
--- trunk/utilities/mod2vpl.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/mod2vpl.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,12 +15,17 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <swmgr.h>
#include <swmodule.h>
#include <swkey.h>
#include <versekey.h>
#include <stdio.h>
#include <iostream>
+
#ifndef NO_SWORD_NAMESPACE
using sword::SWMgr;
using sword::VerseKey;
Modified: trunk/utilities/mod2zmod.cpp
===================================================================
--- trunk/utilities/mod2zmod.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/mod2zmod.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -17,6 +17,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <fcntl.h>
#include <iostream>
#include <fstream>
@@ -39,7 +43,6 @@
#include <stdio.h>
#include <cipherfil.h>
-
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
Modified: trunk/utilities/modwrite.cpp
===================================================================
--- trunk/utilities/modwrite.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/modwrite.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <fcntl.h>
#include <iostream>
#include <fstream>
Modified: trunk/utilities/osis2mod.cpp
===================================================================
--- trunk/utilities/osis2mod.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/osis2mod.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
@@ -1347,7 +1351,7 @@
// Outside of tokens merge adjacent whitespace
if (!intoken) {
- seeingSpace = isspace(curChar);
+ seeingSpace = isspace(curChar)!=0;
if (seeingSpace) {
if (inWhitespace) {
continue;
Modified: trunk/utilities/step2vpl.cpp
===================================================================
--- trunk/utilities/step2vpl.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/step2vpl.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <iostream>
#include <string>
#include <stdio.h>
Modified: trunk/utilities/stepdump.cpp
===================================================================
--- trunk/utilities/stepdump.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/stepdump.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
Modified: trunk/utilities/tei2mod.cpp
===================================================================
--- trunk/utilities/tei2mod.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/tei2mod.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -43,6 +43,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <string>
#include <vector>
#include <fstream>
Modified: trunk/utilities/treeidxutil.cpp
===================================================================
--- trunk/utilities/treeidxutil.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/treeidxutil.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <entriesblk.h>
#include <iostream>
#include <string>
Modified: trunk/utilities/vpl2mod.cpp
===================================================================
--- trunk/utilities/vpl2mod.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/vpl2mod.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trunk/utilities/vs2osisref.cpp
===================================================================
--- trunk/utilities/vs2osisref.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/vs2osisref.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <iostream>
#include <versekey.h>
#include <localemgr.h>
@@ -22,6 +26,7 @@
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
+
using std::endl;
using std::cerr;
using std::cout;
Modified: trunk/utilities/vs2osisreftxt.cpp
===================================================================
--- trunk/utilities/vs2osisreftxt.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/vs2osisreftxt.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,11 +15,16 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <iostream>
#include <stdio.h>
#include <versekey.h>
#include <localemgr.h>
+
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
Modified: trunk/utilities/xml2gbs.cpp
===================================================================
--- trunk/utilities/xml2gbs.cpp 2010-10-04 07:09:06 UTC (rev 2561)
+++ trunk/utilities/xml2gbs.cpp 2010-10-04 08:35:09 UTC (rev 2562)
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
More information about the sword-cvs
mailing list