[tango] 18/21: remove useless patch
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jan 15 15:59:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit bd41b794d5a67d64b2e042d91cde747c8600d4df
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Oct 8 15:27:53 2015 +0200
remove useless patch
---
.../patches/0009-fix-forwarded-upstream-gcc5.patch | 60 ----------------------
1 file changed, 60 deletions(-)
diff --git a/debian/patches/0009-fix-forwarded-upstream-gcc5.patch b/debian/patches/0009-fix-forwarded-upstream-gcc5.patch
deleted file mode 100644
index 19d5dfb..0000000
--- a/debian/patches/0009-fix-forwarded-upstream-gcc5.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 13 Sep 2015 11:45:56 +0200
-Subject: fix forwarded upstream gcc5
-
----
- lib/cpp/server/tango_const.h | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/lib/cpp/server/tango_const.h b/lib/cpp/server/tango_const.h
-index cb50194..ccee58a 100644
---- a/lib/cpp/server/tango_const.h
-+++ b/lib/cpp/server/tango_const.h
-@@ -950,18 +950,23 @@ typedef struct _OptAttrProp
-
-
- // Ranges type-enum-string conversions
-+#ifdef _GLIBCXX_USE_CXX11_ABI
-+#define TANGO_CXX11_ABI __attribute((abi_tag("cxx11")))
-+#else
-+#define TANGO_CXX11_ABI
-+#endif
-
- template <typename T>
- struct ranges_type2const
- {
- static CmdArgType enu;
-- static string str;
-+ static TANGO_CXX11_ABI string str;
- };
-
- template <CmdArgType>
- struct ranges_const2type
- {
-- static string str;
-+ static TANGO_CXX11_ABI string str;
- };
-
- #define RANGES_TYPE2CONST(type,constant) \
-@@ -969,17 +974,17 @@ struct ranges_const2type
- struct ranges_type2const<type> \
- { \
- static CmdArgType enu; \
-- static string str; \
-+ static TANGO_CXX11_ABI string str; \
- }; \
- CmdArgType ranges_type2const<type>::enu = constant; \
-- string ranges_type2const<type>::str = #type; \
-+ TANGO_CXX11_ABI string ranges_type2const<type>::str = #type; \
- template<> \
- struct ranges_const2type<Tango::constant> \
- { \
- typedef type Type; \
-- static string str; \
-+ static TANGO_CXX11_ABI string str; \
- }; \
-- string ranges_const2type<Tango::constant>::str = #type;
-+ TANGO_CXX11_ABI string ranges_const2type<Tango::constant>::str = #type;
-
- /*
- * List of strings used by the API as the DevError reason field.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list