You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2012/07/22 14:33:34 UTC
[lucy-commits] svn commit: r1364278 - in /lucy/trunk: c/src/ clownfish/src/ core/Clownfish/
core/Lucy/Object/ core/Lucy/Search/ core/Lucy/Util/ example-lang/src/
perl/buildlib/Lucy/Build/Binding/ perl/lib/ perl/lib/Clownfish/
perl/lib/Lucy/Object/ perl/t/ perl/t/bind...
Author: marvin
Date: Sun Jul 22 12:33:33 2012
New Revision: 1364278
URL: http://svn.apache.org/viewvc?rev=1364278&view=rev
Log:
LUCY-242 Move VTable under Clownfish.
Added:
lucy/trunk/core/Clownfish/VTable.c
- copied, changed from r1363569, lucy/trunk/core/Lucy/Object/VTable.c
lucy/trunk/core/Clownfish/VTable.cfh
- copied, changed from r1363518, lucy/trunk/core/Lucy/Object/VTable.cfh
lucy/trunk/perl/lib/Clownfish/VTable.pm
- copied, changed from r1363518, lucy/trunk/perl/lib/Lucy/Object/VTable.pm
lucy/trunk/perl/xs/Clownfish/
lucy/trunk/perl/xs/Clownfish/VTable.c
- copied, changed from r1363518, lucy/trunk/perl/xs/Lucy/Object/VTable.c
Removed:
lucy/trunk/core/Lucy/Object/VTable.c
lucy/trunk/core/Lucy/Object/VTable.cfh
lucy/trunk/perl/lib/Lucy/Object/VTable.pm
lucy/trunk/perl/xs/Lucy/Object/VTable.c
Modified:
lucy/trunk/c/src/CFBind.h
lucy/trunk/clownfish/src/CFCBindCore.c
lucy/trunk/clownfish/src/CFCPerl.c
lucy/trunk/core/Clownfish/LockFreeRegistry.c
lucy/trunk/core/Lucy/Object/ByteBuf.c
lucy/trunk/core/Lucy/Object/CharBuf.c
lucy/trunk/core/Lucy/Object/Err.c
lucy/trunk/core/Lucy/Object/Hash.c
lucy/trunk/core/Lucy/Object/Method.c
lucy/trunk/core/Lucy/Object/Num.c
lucy/trunk/core/Lucy/Object/Obj.c
lucy/trunk/core/Lucy/Object/VArray.c
lucy/trunk/core/Lucy/Search/Matcher.c
lucy/trunk/core/Lucy/Util/ToolSet.h
lucy/trunk/example-lang/src/CFBind.h
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
lucy/trunk/perl/lib/Lucy.pm
lucy/trunk/perl/t/021-vtable.t
lucy/trunk/perl/t/binding/016-varray.t
lucy/trunk/perl/t/binding/017-hash.t
lucy/trunk/perl/t/binding/029-charbuf.t
lucy/trunk/perl/xs/Lucy/Object/Host.c
lucy/trunk/perl/xs/Lucy/Object/Obj.c
lucy/trunk/perl/xs/XSBind.h
lucy/trunk/ruby/src/CFBind.h
Modified: lucy/trunk/c/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/c/src/CFBind.h?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/c/src/CFBind.h (original)
+++ lucy/trunk/c/src/CFBind.h Sun Jul 22 12:33:33 2012
@@ -32,7 +32,7 @@ extern "C" {
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/Num.h"
#include "Lucy/Object/VArray.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
/* Strip the prefix from some common symbols where we know there's no
* conflict. It's a little inconsistent to do this rather than leave all
Modified: lucy/trunk/clownfish/src/CFCBindCore.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCBindCore.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCBindCore.c (original)
+++ lucy/trunk/clownfish/src/CFCBindCore.c Sun Jul 22 12:33:33 2012
@@ -331,7 +331,7 @@ S_write_parcel_c(CFCBindCore *self) {
"#define C_LUCY_VTABLE\n"
"%s\n"
"#include \"parcel.h\"\n"
- "#include \"Lucy/Object/VTable.h\"\n"
+ "#include \"Clownfish/VTable.h\"\n"
"%s\n"
"\n"
"typedef struct cfish_MethodSpec {\n"
Modified: lucy/trunk/clownfish/src/CFCPerl.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCPerl.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCPerl.c (original)
+++ lucy/trunk/clownfish/src/CFCPerl.c Sun Jul 22 12:33:33 2012
@@ -301,7 +301,7 @@ S_write_boot_c(CFCPerl *self) {
"#include \"%s\"\n"
"#include \"parcel.h\"\n"
"#include \"Lucy/Object/CharBuf.h\"\n"
- "#include \"Lucy/Object/VTable.h\"\n"
+ "#include \"Clownfish/VTable.h\"\n"
"%s\n"
"\n"
"void\n"
Modified: lucy/trunk/core/Clownfish/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/LockFreeRegistry.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/LockFreeRegistry.c (original)
+++ lucy/trunk/core/Clownfish/LockFreeRegistry.c Sun Jul 22 12:33:33 2012
@@ -20,7 +20,7 @@
#include "Clownfish/LockFreeRegistry.h"
#include "Lucy/Object/Err.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Util/Atomic.h"
#include "Lucy/Util/Memory.h"
Copied: lucy/trunk/core/Clownfish/VTable.c (from r1363569, lucy/trunk/core/Lucy/Object/VTable.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.c?p2=lucy/trunk/core/Clownfish/VTable.c&p1=lucy/trunk/core/Lucy/Object/VTable.c&r1=1363569&r2=1364278&rev=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/VTable.c (original)
+++ lucy/trunk/core/Clownfish/VTable.c Sun Jul 22 12:33:33 2012
@@ -24,7 +24,7 @@
#include <string.h>
#include <ctype.h>
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
Copied: lucy/trunk/core/Clownfish/VTable.cfh (from r1363518, lucy/trunk/core/Lucy/Object/VTable.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.cfh?p2=lucy/trunk/core/Clownfish/VTable.cfh&p1=lucy/trunk/core/Lucy/Object/VTable.cfh&r1=1363518&r2=1364278&rev=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/VTable.cfh (original)
+++ lucy/trunk/core/Clownfish/VTable.cfh Sun Jul 22 12:33:33 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* behavior of VTables.)
*/
-class Lucy::Object::VTable inherits Lucy::Object::Obj {
+class Clownfish::VTable inherits Lucy::Object::Obj {
VTable *parent;
CharBuf *name;
Modified: lucy/trunk/core/Lucy/Object/ByteBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/ByteBuf.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/ByteBuf.c (original)
+++ lucy/trunk/core/Lucy/Object/ByteBuf.c Sun Jul 22 12:33:33 2012
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <ctype.h>
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/ByteBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Store/InStream.h"
Modified: lucy/trunk/core/Lucy/Object/CharBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/CharBuf.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/CharBuf.c (original)
+++ lucy/trunk/core/Lucy/Object/CharBuf.c Sun Jul 22 12:33:33 2012
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <ctype.h>
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
Modified: lucy/trunk/core/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Err.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Err.c (original)
+++ lucy/trunk/core/Lucy/Object/Err.c Sun Jul 22 12:33:33 2012
@@ -26,7 +26,7 @@
#include "Lucy/Object/Err.h"
#include "Lucy/Object/CharBuf.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Util/Memory.h"
Err*
Modified: lucy/trunk/core/Lucy/Object/Hash.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Hash.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Hash.c (original)
+++ lucy/trunk/core/Lucy/Object/Hash.c Sun Jul 22 12:33:33 2012
@@ -22,7 +22,7 @@
#include <string.h>
#include <stdlib.h>
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/CharBuf.h"
Modified: lucy/trunk/core/Lucy/Object/Method.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Method.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Method.c (original)
+++ lucy/trunk/core/Lucy/Object/Method.c Sun Jul 22 12:33:33 2012
@@ -21,7 +21,7 @@
#include "Lucy/Object/Method.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
Method*
Method_new(const CharBuf *name, lucy_method_t callback_func, size_t offset) {
Modified: lucy/trunk/core/Lucy/Object/Num.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Num.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Num.c (original)
+++ lucy/trunk/core/Lucy/Object/Num.c Sun Jul 22 12:33:33 2012
@@ -29,7 +29,7 @@
#include "Lucy/Object/Num.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
Modified: lucy/trunk/core/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Obj.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Obj.c (original)
+++ lucy/trunk/core/Lucy/Object/Obj.c Sun Jul 22 12:33:33 2012
@@ -27,7 +27,7 @@
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/core/Lucy/Object/VArray.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/VArray.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/VArray.c (original)
+++ lucy/trunk/core/Lucy/Object/VArray.c Sun Jul 22 12:33:33 2012
@@ -21,7 +21,7 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/VArray.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/core/Lucy/Search/Matcher.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Matcher.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Matcher.c (original)
+++ lucy/trunk/core/Lucy/Search/Matcher.c Sun Jul 22 12:33:33 2012
@@ -20,7 +20,7 @@
#include "Lucy/Search/Matcher.h"
#include "Lucy/Object/Err.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Search/Collector.h"
Matcher*
Modified: lucy/trunk/core/Lucy/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ lucy/trunk/core/Lucy/Util/ToolSet.h Sun Jul 22 12:33:33 2012
@@ -45,7 +45,7 @@ extern "C" {
#include "Lucy/Object/I32Array.h"
#include "Lucy/Object/Num.h"
#include "Lucy/Object/VArray.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Util/NumberUtils.h"
#include "Lucy/Util/Memory.h"
#include "Lucy/Util/StringHelper.h"
Modified: lucy/trunk/example-lang/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/example-lang/src/CFBind.h?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/example-lang/src/CFBind.h (original)
+++ lucy/trunk/example-lang/src/CFBind.h Sun Jul 22 12:33:33 2012
@@ -32,7 +32,7 @@ extern "C" {
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/Num.h"
#include "Lucy/Object/VArray.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
/* Strip the prefix from some common symbols where we know there's no
* conflict. It's a little inconsistent to do this rather than leave all
Modified: lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm Sun Jul 22 12:33:33 2012
@@ -821,7 +821,7 @@ sub bind_vtable {
my @hand_rolled = qw( Make_Obj );
my $xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::VTable
+MODULE = Lucy PACKAGE = Clownfish::VTable
SV*
_get_registry()
@@ -866,7 +866,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::VTable",
+ class_name => "Clownfish::VTable",
);
$binding->exclude_method($_) for @hand_rolled;
$binding->append_xs($xs_code);
Copied: lucy/trunk/perl/lib/Clownfish/VTable.pm (from r1363518, lucy/trunk/perl/lib/Lucy/Object/VTable.pm)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/VTable.pm?p2=lucy/trunk/perl/lib/Clownfish/VTable.pm&p1=lucy/trunk/perl/lib/Lucy/Object/VTable.pm&r1=1363518&r2=1364278&rev=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Object/VTable.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/VTable.pm Sun Jul 22 12:33:33 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Object::VTable;
+package Clownfish::VTable;
use Lucy;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
Modified: lucy/trunk/perl/lib/Lucy.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Lucy.pm?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucy/trunk/perl/lib/Lucy.pm Sun Jul 22 12:33:33 2012
@@ -139,7 +139,7 @@ sub error {$Lucy::Object::Err::error}
}
{
- package Lucy::Object::VTable;
+ package Clownfish::VTable;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
Modified: lucy/trunk/perl/t/021-vtable.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/021-vtable.t?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/t/021-vtable.t (original)
+++ lucy/trunk/perl/t/021-vtable.t Sun Jul 22 12:33:33 2012
@@ -87,7 +87,7 @@ $resurrected->store( "ooga", $booga );
is( $resurrected->fetch("ooga"),
"booga", "subclassed object still performs correctly at the C level" );
-my $methods = Lucy::Object::VTable->fresh_host_methods('MyHash');
+my $methods = Clownfish::VTable->fresh_host_methods('MyHash');
is_deeply( $methods->to_perl, ['oodle'], "fresh_host_methods" );
my $folder = RAMFolderOfDeath->new;
Modified: lucy/trunk/perl/t/binding/016-varray.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/016-varray.t?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/016-varray.t (original)
+++ lucy/trunk/perl/t/binding/016-varray.t Sun Jul 22 12:33:33 2012
@@ -37,7 +37,7 @@ $outstream->close;
my $instream = Lucy::Store::InStream->open( file => $ram_file )
or die Lucy->error;
my $vtable
- = Lucy::Object::VTable->singleton( class_name => 'Lucy::Object::VArray', );
+ = Clownfish::VTable->singleton( class_name => 'Lucy::Object::VArray', );
my $deserialized = $vtable->make_obj->deserialize($instream);
is_deeply( $varray->to_perl, $deserialized->to_perl,
"serialize/deserialize" );
Modified: lucy/trunk/perl/t/binding/017-hash.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/017-hash.t?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/017-hash.t (original)
+++ lucy/trunk/perl/t/binding/017-hash.t Sun Jul 22 12:33:33 2012
@@ -40,7 +40,7 @@ $outstream->close;
my $instream = Lucy::Store::InStream->open( file => $ram_file )
or die Lucy->error;
my $hash_vtable
- = Lucy::Object::VTable->singleton( class_name => 'Lucy::Object::Hash' );
+ = Clownfish::VTable->singleton( class_name => 'Lucy::Object::Hash' );
my $deserialized = $hash_vtable->make_obj->deserialize($instream);
is_deeply( $hash->to_perl, $deserialized->to_perl, "serialize/deserialize" );
Modified: lucy/trunk/perl/t/binding/029-charbuf.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/029-charbuf.t?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/029-charbuf.t (original)
+++ lucy/trunk/perl/t/binding/029-charbuf.t Sun Jul 22 12:33:33 2012
@@ -44,7 +44,7 @@ $outstream->close;
my $instream = Lucy::Store::InStream->open( file => $ram_file )
or die Lucy->error;
my $charbuf_vtable
- = Lucy::Object::VTable->singleton( class_name => 'Lucy::Object::CharBuf',
+ = Clownfish::VTable->singleton( class_name => 'Lucy::Object::CharBuf',
);
my $deserialized = $charbuf_vtable->make_obj->deserialize($instream);
is_deeply( $charbuf->to_perl, $deserialized->to_perl,
Copied: lucy/trunk/perl/xs/Clownfish/VTable.c (from r1363518, lucy/trunk/perl/xs/Lucy/Object/VTable.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/VTable.c?p2=lucy/trunk/perl/xs/Clownfish/VTable.c&p1=lucy/trunk/perl/xs/Lucy/Object/VTable.c&r1=1363518&r2=1364278&rev=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/VTable.c (original)
+++ lucy/trunk/perl/xs/Clownfish/VTable.c Sun Jul 22 12:33:33 2012
@@ -18,7 +18,7 @@
#define C_LUCY_VTABLE
#include "XSBind.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/Host.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/perl/xs/Lucy/Object/Host.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/Host.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Host.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Host.c Sun Jul 22 12:33:33 2012
@@ -16,7 +16,7 @@
#include "XSBind.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/Host.h"
Modified: lucy/trunk/perl/xs/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/Obj.c?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Obj.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Obj.c Sun Jul 22 12:33:33 2012
@@ -24,7 +24,7 @@
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "Lucy/Util/Memory.h"
static void
Modified: lucy/trunk/perl/xs/XSBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.h?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.h (original)
+++ lucy/trunk/perl/xs/XSBind.h Sun Jul 22 12:33:33 2012
@@ -32,7 +32,7 @@ extern "C" {
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/Num.h"
#include "Lucy/Object/VArray.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
#include "EXTERN.h"
#include "perl.h"
Modified: lucy/trunk/ruby/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/ruby/src/CFBind.h?rev=1364278&r1=1364277&r2=1364278&view=diff
==============================================================================
--- lucy/trunk/ruby/src/CFBind.h (original)
+++ lucy/trunk/ruby/src/CFBind.h Sun Jul 22 12:33:33 2012
@@ -32,7 +32,7 @@ extern "C" {
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/Num.h"
#include "Lucy/Object/VArray.h"
-#include "Lucy/Object/VTable.h"
+#include "Clownfish/VTable.h"
/* Strip the prefix from some common symbols where we know there's no
* conflict. It's a little inconsistent to do this rather than leave all