lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [lucy-commits] git commit: refs/heads/move-dumpable - Fix minor compiler warnings.
Date Wed, 31 Jul 2013 01:24:45 GMT
Updated Branches:
  refs/heads/move-dumpable 3c3bbaae7 -> c5f0ea6a2


Fix minor compiler warnings.

Remove unused function, add a couple casts.

This commit hould be folded into other commits before merging to master.


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

Branch: refs/heads/move-dumpable
Commit: c5f0ea6a2d2d47012301affd0135cbe2bb00220f
Parents: 3c3bbaa
Author: Marvin Humphrey <marvin@rectangular.com>
Authored: Tue Jul 30 18:23:39 2013 -0700
Committer: Marvin Humphrey <marvin@rectangular.com>
Committed: Tue Jul 30 18:23:39 2013 -0700

----------------------------------------------------------------------
 clownfish/runtime/core/Clownfish/Test/TestVArray.c | 5 -----
 core/Lucy/Analysis/RegexTokenizer.c                | 2 +-
 core/Lucy/Plan/Schema.c                            | 3 ++-
 3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/c5f0ea6a/clownfish/runtime/core/Clownfish/Test/TestVArray.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestVArray.c b/clownfish/runtime/core/Clownfish/Test/TestVArray.c
index 802388a..d64403a 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestVArray.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestVArray.c
@@ -35,11 +35,6 @@ TestVArray_new() {
     return (TestVArray*)VTable_Make_Obj(TESTVARRAY);
 }
 
-static CharBuf*
-S_new_cb(const char *text) {
-    return CB_new_from_utf8(text, strlen(text));
-}
-
 static void
 test_Equals(TestBatchRunner *runner) {
     VArray *array = VA_new(0);

http://git-wip-us.apache.org/repos/asf/lucy/blob/c5f0ea6a/core/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.c b/core/Lucy/Analysis/RegexTokenizer.c
index a4fbe45..d504498 100644
--- a/core/Lucy/Analysis/RegexTokenizer.c
+++ b/core/Lucy/Analysis/RegexTokenizer.c
@@ -56,7 +56,7 @@ RegexTokenizer_dump(RegexTokenizer *self) {
     RegexTokenizer_Dump_t super_dump
         = SUPER_METHOD_PTR(REGEXTOKENIZER, Lucy_RegexTokenizer_Dump);
     Hash *dump = (Hash*)CERTIFY(super_dump(self), HASH);
-    Hash_Store_Str(dump, "pattern", 7, CB_Clone(ivars->pattern));
+    Hash_Store_Str(dump, "pattern", 7, (Obj*)CB_Clone(ivars->pattern));
     return (Obj*)dump;
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/c5f0ea6a/core/Lucy/Plan/Schema.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Schema.c b/core/Lucy/Plan/Schema.c
index 9ddb230..70ac685 100644
--- a/core/Lucy/Plan/Schema.c
+++ b/core/Lucy/Plan/Schema.c
@@ -258,7 +258,8 @@ Schema_dump(Schema *self) {
     // Record class name, store dumps of unique Analyzers.
     Hash_Store_Str(dump, "_class", 6,
                    (Obj*)CB_Clone(Schema_Get_Class_Name(self)));
-    Hash_Store_Str(dump, "analyzers", 9, Freezer_dump(ivars->uniq_analyzers));
+    Hash_Store_Str(dump, "analyzers", 9,
+                   Freezer_dump((Obj*)ivars->uniq_analyzers));
 
     // Dump FieldTypes.
     Hash_Store_Str(dump, "fields", 6, (Obj*)type_dumps);


Mime
View raw message