[tango] 02/05: fix for real the FTBFS

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit 10f1a0bc68c0bb0a72b1c9d81b5ef5b06ee49bc5
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Sep 2 19:54:25 2015 +0200

    fix for real the FTBFS
---
 debian/patches/0009-fix-gcc5-compilation.patch | 107 +++++++++++++++++++++++--
 1 file changed, 100 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0009-fix-gcc5-compilation.patch b/debian/patches/0009-fix-gcc5-compilation.patch
index 3f371d7..773b7e3 100644
--- a/debian/patches/0009-fix-gcc5-compilation.patch
+++ b/debian/patches/0009-fix-gcc5-compilation.patch
@@ -1,14 +1,14 @@
 From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Wed, 2 Sep 2015 18:32:54 +0200
+Date: Wed, 2 Sep 2015 19:53:58 +0200
 Subject: fix gcc5 compilation
 
 ---
- lib/cpp/server/attribute.cpp   | 15 ---------------
- lib/cpp/server/w_attribute.cpp | 15 +++++++++++++++
- 2 files changed, 15 insertions(+), 15 deletions(-)
+ lib/cpp/server/attribute.cpp   | 58 ------------------------------------------
+ lib/cpp/server/w_attribute.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 58 deletions(-)
 
 diff --git a/lib/cpp/server/attribute.cpp b/lib/cpp/server/attribute.cpp
-index 858d7af..c963217 100644
+index 858d7af..67ec542 100644
 --- a/lib/cpp/server/attribute.cpp
 +++ b/lib/cpp/server/attribute.cpp
 @@ -56,21 +56,6 @@ static const char *RcsId = "$Id: attribute.cpp 22617 2013-05-05 12:53:58Z taurel
@@ -33,11 +33,61 @@ index 858d7af..c963217 100644
  //
  // A classical function which will be used as unary predicate for the find_if
  // algo. It must be used with the bind2nd adapter to be transform as unary and
+@@ -4696,49 +4681,6 @@ void Attribute::set_upd_properties(const AttributeConfig_3 &conf,string &dev_nam
+ 	}
+ }
+ 
+-void Attribute::set_min_alarm(char *new_min_alarm_str)
+-{
+-	set_min_alarm(string(new_min_alarm_str));
+-}
+-
+-void Attribute::set_min_alarm(const char *new_min_alarm_str)
+-{
+-	set_min_alarm(string(new_min_alarm_str));
+-}
+-
+-
+-void Attribute::set_max_alarm(char *new_max_alarm_str)
+-{
+-	set_max_alarm(string(new_max_alarm_str));
+-}
+-
+-void Attribute::set_max_alarm(const char *new_max_alarm_str)
+-{
+-	set_max_alarm(string(new_max_alarm_str));
+-}
+-
+-
+-void Attribute::set_min_warning(char *new_min_warning_str)
+-{
+-	set_min_warning(string(new_min_warning_str));
+-}
+-
+-void Attribute::set_min_warning(const char *new_min_warning_str)
+-{
+-	set_min_warning(string(new_min_warning_str));
+-}
+-
+-
+-void Attribute::set_max_warning(char *new_max_warning_str)
+-{
+-	set_max_warning(string(new_max_warning_str));
+-}
+-
+-void Attribute::set_max_warning(const char *new_max_warning_str)
+-{
+-	set_max_warning(string(new_max_warning_str));
+-}
+-
+ //--------------------------------------------------------------------------------------------------------------------
+ //
+ // method :
 diff --git a/lib/cpp/server/w_attribute.cpp b/lib/cpp/server/w_attribute.cpp
-index 6fbffd2..cb2011d 100644
+index 6fbffd2..f3ed3bb 100644
 --- a/lib/cpp/server/w_attribute.cpp
 +++ b/lib/cpp/server/w_attribute.cpp
-@@ -63,6 +63,21 @@ static const char *RcsId = "$Id: w_attribute.cpp 22302 2013-03-22 08:28:27Z taur
+@@ -63,6 +63,64 @@ static const char *RcsId = "$Id: w_attribute.cpp 22302 2013-03-22 08:28:27Z taur
  namespace Tango
  {
  
@@ -56,6 +106,49 @@ index 6fbffd2..cb2011d 100644
 +  RANGES_TYPE2CONST(Tango::DevString,DEV_STRING)
 +  RANGES_TYPE2CONST(Tango::DevState,DEV_STATE)
 +
++  void Attribute::set_min_alarm(char *new_min_alarm_str)
++  {
++    set_min_alarm(string(new_min_alarm_str));
++  }
++
++  void Attribute::set_min_alarm(const char *new_min_alarm_str)
++  {
++    set_min_alarm(string(new_min_alarm_str));
++  }
++
++
++  void Attribute::set_max_alarm(char *new_max_alarm_str)
++  {
++    set_max_alarm(string(new_max_alarm_str));
++  }
++
++  void Attribute::set_max_alarm(const char *new_max_alarm_str)
++  {
++    set_max_alarm(string(new_max_alarm_str));
++  }
++
++
++  void Attribute::set_min_warning(char *new_min_warning_str)
++  {
++    set_min_warning(string(new_min_warning_str));
++  }
++
++  void Attribute::set_min_warning(const char *new_min_warning_str)
++  {
++    set_min_warning(string(new_min_warning_str));
++  }
++
++
++  void Attribute::set_max_warning(char *new_max_warning_str)
++  {
++    set_max_warning(string(new_max_warning_str));
++  }
++
++  void Attribute::set_max_warning(const char *new_max_warning_str)
++  {
++    set_max_warning(string(new_max_warning_str));
++  }
++
  //+-------------------------------------------------------------------------
  //
  // method : 		WAttribute::WAttribute

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git