[freeorion] 05/05: Rebase make-destructors-public.patch
Markus Koschany
apo at moszumanska.debian.org
Mon Aug 22 01:27:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository freeorion.
commit f0197c92b51c30f70ddd960123fa058e40eaacc2
Author: Markus Koschany <apo at debian.org>
Date: Mon Aug 22 01:46:15 2016 +0200
Rebase make-destructors-public.patch
---
debian/patches/make-destructors-public.patch | 49 +++++++++++++---------------
1 file changed, 23 insertions(+), 26 deletions(-)
diff --git a/debian/patches/make-destructors-public.patch b/debian/patches/make-destructors-public.patch
index 59706de..33cce40 100644
--- a/debian/patches/make-destructors-public.patch
+++ b/debian/patches/make-destructors-public.patch
@@ -1,9 +1,9 @@
-From 0a0bfecac11ec376263815f559e4b1b33ff6b4c3 Mon Sep 17 00:00:00 2001
-From: "Markus (root)" <mo at wurzel.org>
-Date: Thu, 21 Jul 2016 21:15:20 +0200
-Subject: [PATCH] Make destructors public
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 22 Aug 2016 01:44:53 +0200
+Subject: make destructors public
-Debian-Bug: https://bugs.debian.org/833773
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833773
+Origin: https://github.com/freeorion/freeorion/issues/777 (veelai)
---
universe/Building.h | 2 +-
universe/Field.h | 2 +-
@@ -14,7 +14,7 @@ Debian-Bug: https://bugs.debian.org/833773
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/universe/Building.h b/universe/Building.h
-index 2cb59b0..dec0080 100644
+index 17e889c..83057f1 100644
--- a/universe/Building.h
+++ b/universe/Building.h
@@ -52,6 +52,7 @@ public:
@@ -34,10 +34,10 @@ index 2cb59b0..dec0080 100644
virtual Building* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Building
//@}
diff --git a/universe/Field.h b/universe/Field.h
-index 5b30bb3..f193710 100644
+index 8cb5b9a..6e6ea16 100644
--- a/universe/Field.h
+++ b/universe/Field.h
-@@ -39,6 +39,7 @@ public:
+@@ -38,6 +38,7 @@ public:
virtual void ResetTargetMaxUnpairedMeters();
//@}
@@ -45,7 +45,7 @@ index 5b30bb3..f193710 100644
protected:
friend class Universe;
-@@ -48,7 +49,6 @@ protected:
+@@ -47,7 +48,6 @@ protected:
template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
template <class T> friend void boost::checked_delete(T* x);
@@ -54,10 +54,10 @@ index 5b30bb3..f193710 100644
virtual Field* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Field
//@}
diff --git a/universe/Fleet.h b/universe/Fleet.h
-index f133af0..ac602ac 100644
+index 9b44103..f32bf10 100644
--- a/universe/Fleet.h
+++ b/universe/Fleet.h
-@@ -129,6 +129,7 @@ public:
+@@ -128,6 +128,7 @@ public:
static const int ETA_NEVER; ///< returned by ETA when fleet can't reach destination due to lack of route or inability to move
static const int ETA_UNKNOWN; ///< returned when ETA can't be determined
static const int ETA_OUT_OF_RANGE; ///< returned by ETA when fleet can't reach destination due to insufficient fuel capacity and lack of fleet resupply on route
@@ -65,7 +65,7 @@ index f133af0..ac602ac 100644
protected:
friend class Universe;
-@@ -150,7 +151,6 @@ protected:
+@@ -149,7 +150,6 @@ protected:
template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
template <class T> friend void boost::checked_delete(T* x);
@@ -74,10 +74,10 @@ index f133af0..ac602ac 100644
virtual Fleet* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Fleet
//@}
diff --git a/universe/Planet.h b/universe/Planet.h
-index cece39a..233d31f 100644
+index ec4a6c3..ec09344 100644
--- a/universe/Planet.h
+++ b/universe/Planet.h
-@@ -176,6 +176,7 @@ public:
+@@ -172,6 +172,7 @@ public:
//@}
static int TypeDifference(PlanetType type1, PlanetType type2);
@@ -85,7 +85,7 @@ index cece39a..233d31f 100644
protected:
friend class Universe;
-@@ -187,7 +188,6 @@ protected:
+@@ -183,7 +184,6 @@ protected:
template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
template <class T> friend void boost::checked_delete(T* x);
@@ -94,18 +94,18 @@ index cece39a..233d31f 100644
virtual Planet* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Planet
//@}
diff --git a/universe/Ship.h b/universe/Ship.h
-index 5e9eabb..76fac51 100644
+index 2599064..e22956c 100644
--- a/universe/Ship.h
+++ b/universe/Ship.h
-@@ -86,6 +86,7 @@ public:
-
- virtual void ResetTargetMaxUnpairedMeters();
+@@ -92,6 +92,7 @@ public:
+ virtual void ResetPairedActiveMeters();
+ virtual void SetShipMetersToMax();
//@}
+ ~Ship() {}
protected:
friend class Universe;
-@@ -96,7 +97,6 @@ protected:
+@@ -102,7 +103,6 @@ protected:
template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
template <class T> friend void boost::checked_delete(T* x);
@@ -114,10 +114,10 @@ index 5e9eabb..76fac51 100644
virtual Ship* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Ship
//@}
diff --git a/universe/System.h b/universe/System.h
-index c92fed4..471c27e 100644
+index 0740720..07792bd 100644
--- a/universe/System.h
+++ b/universe/System.h
-@@ -110,6 +110,7 @@ public:
+@@ -109,6 +109,7 @@ public:
virtual void ResetTargetMaxUnpairedMeters();
//@}
@@ -125,7 +125,7 @@ index c92fed4..471c27e 100644
protected:
friend class Universe;
-@@ -133,7 +134,6 @@ protected:
+@@ -132,7 +133,6 @@ protected:
template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
template <class T> friend void boost::checked_delete(T* x);
@@ -133,6 +133,3 @@ index c92fed4..471c27e 100644
virtual System* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this System
//@}
---
-2.9.2
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeorion.git
More information about the Pkg-games-commits
mailing list