lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [3/9] git commit: refs/heads/master - Fix compilation with C++ compiler
Date Mon, 10 Mar 2014 20:40:07 GMT
Fix compilation with C++ compiler


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/f3044589
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/f3044589
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/f3044589

Branch: refs/heads/master
Commit: f3044589f612771b57eecc5fce8dfa2047035fb9
Parents: a7807e7
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Mar 10 19:05:52 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Mar 10 19:05:52 2014 +0100

----------------------------------------------------------------------
 core/Lucy.c              | 2 ++
 core/Lucy/Util/Freezer.c | 4 ++--
 core/TestLucy.c          | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/f3044589/core/Lucy.c
----------------------------------------------------------------------
diff --git a/core/Lucy.c b/core/Lucy.c
index 4bbfad5..a36da32 100644
--- a/core/Lucy.c
+++ b/core/Lucy.c
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "lucy_parcel.h"
+
 void
 lucy_init_parcel() {
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/f3044589/core/Lucy/Util/Freezer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Freezer.c b/core/Lucy/Util/Freezer.c
index ea22431..16e37c8 100644
--- a/core/Lucy/Util/Freezer.c
+++ b/core/Lucy/Util/Freezer.c
@@ -216,7 +216,7 @@ Freezer_deserialize_string(String *string, InStream *instream) {
     if (size == SIZE_MAX) {
         THROW(ERR, "Can't deserialize SIZE_MAX bytes");
     }
-    char *buf = MALLOCATE(size + 1);
+    char *buf = (char*)MALLOCATE(size + 1);
     InStream_Read_Bytes(instream, buf, size);
     buf[size] = '\0';
     if (!StrHelp_utf8_valid(buf, size)) {
@@ -241,7 +241,7 @@ Freezer_serialize_bytebuf(ByteBuf *bytebuf, OutStream *outstream) {
 ByteBuf*
 Freezer_deserialize_bytebuf(ByteBuf *bytebuf, InStream *instream) {
     size_t size = InStream_Read_C32(instream);
-    char   *buf = MALLOCATE(size);
+    char   *buf = (char*)MALLOCATE(size);
     InStream_Read_Bytes(instream, buf, size);
     return BB_init_steal_bytes(bytebuf, buf, size, size);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/f3044589/core/TestLucy.c
----------------------------------------------------------------------
diff --git a/core/TestLucy.c b/core/TestLucy.c
index 971dbae..f499da5 100644
--- a/core/TestLucy.c
+++ b/core/TestLucy.c
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "testlucy_parcel.h"
+
 void
 testlucy_init_parcel() {
 }


Mime
View raw message