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 2011/06/19 20:22:31 UTC
[lucy-commits] svn commit: r1137399 - in /incubator/lucy/branches/0.1: ./
core/Lucy/Object/Err.c core/Lucy/Object/Err.cfh perl/t/109-read_locking.t
Author: marvin
Date: Sun Jun 19 18:22:30 2011
New Revision: 1137399
URL: http://svn.apache.org/viewvc?rev=1137399&view=rev
Log:
LUCY-152 Errors when no variadic macros.
Fix some compilation errors which occur when variadic macros are not
available.
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/core/Lucy/Object/Err.c
incubator/lucy/branches/0.1/core/Lucy/Object/Err.cfh
incubator/lucy/branches/0.1/perl/t/109-read_locking.t
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/lucy/trunk:1134011
Modified: incubator/lucy/branches/0.1/core/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/core/Lucy/Object/Err.c?rev=1137399&r1=1137398&r2=1137399&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/core/Lucy/Object/Err.c (original)
+++ incubator/lucy/branches/0.1/core/Lucy/Object/Err.c Sun Jun 19 18:22:30 2011
@@ -74,7 +74,7 @@ THROW(VTable *vtable, char *pattern, ...
CharBuf *mess = Err_Get_Mess(err);
va_start(args, pattern);
- CB_VCatF(message, pattern, args);
+ CB_VCatF(mess, pattern, args);
va_end(args);
Err_do_throw(err);
Modified: incubator/lucy/branches/0.1/core/Lucy/Object/Err.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/core/Lucy/Object/Err.cfh?rev=1137399&r1=1137398&r2=1137399&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/core/Lucy/Object/Err.cfh (original)
+++ incubator/lucy/branches/0.1/core/Lucy/Object/Err.cfh Sun Jun 19 18:22:30 2011
@@ -196,7 +196,7 @@ __C__
CFISH_THROW(lucy_VTable *vtable, char* format, ...);
void
CFISH_WARN(char* format, ...);
- void
+ lucy_CharBuf*
CFISH_MAKE_MESS(char* format, ...);
#endif
Modified: incubator/lucy/branches/0.1/perl/t/109-read_locking.t
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/perl/t/109-read_locking.t?rev=1137399&r1=1137398&r2=1137399&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/perl/t/109-read_locking.t (original)
+++ incubator/lucy/branches/0.1/perl/t/109-read_locking.t Sun Jun 19 18:22:30 2011
@@ -33,6 +33,7 @@ use base qw( FastIndexManager );
sub recycle { [] }
package main;
+use Scalar::Util qw( blessed );
use Lucy::Test::TestUtils qw( create_index );
use Lucy::Util::IndexFileNames qw( latest_snapshot );
@@ -80,7 +81,7 @@ SKIP: {
manager => FastIndexManager->new( host => 'me' ),
);
};
- like( $@, qr/deletion/,
+ ok( blessed($@) && $@->isa("Lucy::Store::LockErr"),
"IndexReader dies if it can't get deletion lock" );
}
$folder->delete('locks/deletion.lock') or die "Can't delete 'deletion.lock'";