[sword-svn] r3755 - in trunk: include src/mgr src/modules src/modules/common

[scribe at crosswire.org]

Author: scribe
Date: 2020-07-19 14:43:07 -0400 (Sun, 19 Jul 2020)
New Revision: 3755

Modified:
   trunk/include/defs.h
   trunk/src/mgr/remotetrans.cpp
   trunk/src/modules/common/swcipher.cpp
   trunk/src/modules/swmodule.cpp
Log:
Small changes to fix compiling on Windows

Modified: trunk/include/defs.h
===================================================================
--- trunk/include/defs.h	2020-07-10 17:45:48 UTC (rev 3754)
+++ trunk/include/defs.h	2020-07-19 18:43:07 UTC (rev 3755)
@@ -133,7 +133,14 @@
 
 #define COMMENT SLASH(/)
 #define SLASH(s) /##s
-#  define SWDEPRECATED COMMENT
+/* Use the following line to comment out all deprecation declarations so you
+ * get "no such method" errors in your code when you want to find them.
+ * Use the next line to put them back in.
+ */
+//#  define SWDEPRECATED COMMENT
+#  define SWDEPRECATED
+#define va_copy(dest, src) (dest = src)
+#define unorm2_getNFKDInstance(x) unorm2_getInstance(NULL, "nfkc", UNORM2_DECOMPOSE, x)
 
 
 #elif defined(__GNUC__)

Modified: trunk/src/mgr/remotetrans.cpp
===================================================================
--- trunk/src/mgr/remotetrans.cpp	2020-07-10 17:45:48 UTC (rev 3754)
+++ trunk/src/mgr/remotetrans.cpp	2020-07-19 18:43:07 UTC (rev 3755)
@@ -1,4 +1,4 @@
-/*****************************************************************************
+/*****************************************************************************
  *
  *  remotetrans.cpp -	
  *

Modified: trunk/src/modules/common/swcipher.cpp
===================================================================
--- trunk/src/modules/common/swcipher.cpp	2020-07-10 17:45:48 UTC (rev 3754)
+++ trunk/src/modules/common/swcipher.cpp	2020-07-19 18:43:07 UTC (rev 3755)
@@ -208,7 +208,7 @@
 		}
 		segs[4][i] = lats[csum%62];
 		if (result.size()) result += "-";
-		result += (!encode && !i ? "" : segs[i]);
+		result += (!encode && !i ? "" : segs[i].c_str());
 	}
 	if (encode) {
 		result += "-";

Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp	2020-07-10 17:45:48 UTC (rev 3754)
+++ trunk/src/modules/swmodule.cpp	2020-07-19 18:43:07 UTC (rev 3755)
@@ -708,10 +708,10 @@
 					resultKey->clearBounds();
 				}
 				listKey << *resultKey;
-				lastBuf = (windowSize > 1) ? textBuf : "";
+				lastBuf = (windowSize > 1) ? textBuf.c_str() : "";
 			}
 			else {
-				lastBuf = (windowSize > 1) ? textBuf : "";
+				lastBuf = (windowSize > 1) ? textBuf.c_str() : "";
 			}
 #if defined(USEICUREGEX)
 			}
@@ -801,7 +801,7 @@
 					}
 				}
 				else {
-					lastBuf = (windowSize > 1) ? textBuf : "";
+					lastBuf = (windowSize > 1) ? textBuf.c_str() : "";
 				}
 			}
 			break;