[Pkg-nagios-changes] [pkg-icinga2] 01/04: Remove obsolete patch for Process::IOThreadProc

Alexander Wirt formorer at debian.org
Thu Nov 26 11:59:48 UTC 2015


This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-icinga2.

commit 4a30c279fdd5c4f6683ac1d037965c73215db0f7
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Nov 26 12:29:42 2015 +0100

    Remove obsolete patch for Process::IOThreadProc
---
 debian/patches/30_fix_Process_IOThreadProc_gcc47 | 29 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/30_fix_Process_IOThreadProc_gcc47 b/debian/patches/30_fix_Process_IOThreadProc_gcc47
deleted file mode 100644
index f43e14e..0000000
--- a/debian/patches/30_fix_Process_IOThreadProc_gcc47
+++ /dev/null
@@ -1,29 +0,0 @@
-From b75aa74cbdc86f0a41c1f05938f25f414df06a7c Mon Sep 17 00:00:00 2001
-From: Gunnar Beutner <gunnar at beutner.name>
-Date: Tue, 17 Nov 2015 22:04:50 +0100
-Subject: [PATCH] Fix crash in Process::IOThreadProc when building Icinga 2
- with GCC 4.7.2
-
-fixes #10648
----
- lib/base/process.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/base/process.cpp b/lib/base/process.cpp
-index 089e41d..37ca629 100644
---- a/lib/base/process.cpp
-+++ b/lib/base/process.cpp
-@@ -199,8 +199,8 @@ void Process::IOThreadProc(int tid)
- #endif /* _WIN32 */
- 
- 			int i = 1;
--			std::pair<ProcessHandle, Process::Ptr> kv;
--			BOOST_FOREACH(kv, l_Processes[tid]) {
-+			typedef std::pair<ProcessHandle, Process::Ptr> kv_pair;
-+			BOOST_FOREACH(const kv_pair& kv, l_Processes[tid]) {
- 				const Process::Ptr& process = kv.second;
- #ifdef _WIN32
- 				handles[i] = kv.first;
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index e4b9670..e1c16fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 21_config_changes
-30_fix_Process_IOThreadProc_gcc47

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git



More information about the Pkg-nagios-changes mailing list