[ice] fix slice2cpp patch from previous defective merge

Haïkel Guémar hguemar at fedoraproject.org
Tue May 29 16:23:24 UTC 2012


commit cbf9b17da1c65bcc81b457287bcc8a2e3a9f2057
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Tue May 29 18:23:15 2012 +0200

    fix slice2cpp patch from previous defective merge

 ice-3.4.2-slice2cpp.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ice-3.4.2-slice2cpp.patch b/ice-3.4.2-slice2cpp.patch
index 1c775b6..3721e4b 100644
--- a/ice-3.4.2-slice2cpp.patch
+++ b/ice-3.4.2-slice2cpp.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 8/9] slice2cpp float literals generation fix (RHBZ #812156)
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
-index dfceb00..d689f67 100644
+index dfceb00..8ec5aa5 100644
 --- a/cpp/src/slice2cpp/Gen.cpp
 +++ b/cpp/src/slice2cpp/Gen.cpp
 @@ -104,7 +104,15 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
@@ -17,7 +17,7 @@ index dfceb00..d689f67 100644
          {
 -            out << value << "F";
 +            out << value;
-+            if(std::string::npos == value.find('.')))       // if there's no dot, we add it before the f literal
++            if(std::string::npos == value.find('.'))       // if there's no dot, we add it before the f literal
 +            {
 +                out << ".0f";
 +            }
@@ -29,5 +29,5 @@ index dfceb00..d689f67 100644
          else
          {
 -- 
-1.7.10
+1.7.10.2
 


More information about the scm-commits mailing list