[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit c52e92748ed2967702a43e07cf7c89b38f875802
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Dec 28 20:18:59 2009 +0200

    Fix some warnings from clang++ bytecode2llvm.cpp.

diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index 3c932bf..3a0e945 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -98,7 +98,6 @@ struct cli_bcengine {
 namespace {
 
 static sys::ThreadLocal<const jmp_buf> ExceptionReturn;
-static sys::ThreadLocal<const jmp_buf> MatchCounts;
 
 void do_shutdown() {
     llvm_shutdown();
@@ -106,7 +105,7 @@ void do_shutdown() {
 
 static void NORETURN jit_exception_handler(void)
 {
-    longjmp(*const_cast<jmp_buf*>(ExceptionReturn.get()), 1);
+    longjmp(*(jmp_buf*)(ExceptionReturn.get()), 1);
 }
 
 static void NORETURN jit_ssp_handler(void)
@@ -1277,7 +1276,7 @@ int bytecode_init(void)
 int cli_bytecode_init_jit(struct cli_all_bc *bcs)
 {
     //TODO: if !llvm_is_multi...
-    bcs->engine = new(std::nothrow) struct cli_bcengine;
+    bcs->engine = new(std::nothrow) cli_bcengine;
     if (!bcs->engine)
 	return CL_EMEM;
     bcs->engine->EE = 0;

-- 
Debian repository for ClamAV