[lucy-commits] svn commit: r1134011 - in /incubator/lucy/trunk: core/Lucy/Object/Err.c core/Lucy/Object/Err.cfh perl/t/109-read_locking.t

[ma...@apache.org]

Author: marvin
Date: Thu Jun  9 17:38:46 2011
New Revision: 1134011

URL: http://svn.apache.org/viewvc?rev=1134011&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/trunk/core/Lucy/Object/Err.c
    incubator/lucy/trunk/core/Lucy/Object/Err.cfh
    incubator/lucy/trunk/perl/t/109-read_locking.t

Modified: incubator/lucy/trunk/core/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Err.c?rev=1134011&r1=1134010&r2=1134011&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Err.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Err.c Thu Jun  9 17:38:46 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/trunk/core/Lucy/Object/Err.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Err.cfh?rev=1134011&r1=1134010&r2=1134011&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Err.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Err.cfh Thu Jun  9 17:38:46 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/trunk/perl/t/109-read_locking.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/109-read_locking.t?rev=1134011&r1=1134010&r2=1134011&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/109-read_locking.t (original)
+++ incubator/lucy/trunk/perl/t/109-read_locking.t Thu Jun  9 17:38:46 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'";