lmi
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [lmi] Removing empty messages from static_assert()


From: Greg Chicares
Subject: Re: [lmi] Removing empty messages from static_assert()
Date: Fri, 9 Feb 2018 21:04:09 +0000
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2

On 2018-02-09 19:52, Greg Chicares wrote:
> On 2018-02-09 16:36, Vadim Zeitlin wrote:
> [...]
>>  Would you mind if I submitted a trivial patch removing all of these ""
>> from static_assert?

I've received no copy of my original reply:
  http://lists.nongnu.org/archive/html/lmi/2018-02/msg00052.html
but...belay that. I'll apply your PR 64 and PR 65 first, and
apply the patch below as you had suggested. I have no plans to
change anything else soon, so you can make your static_assert
patch on top of those changes (as you were probably planning
to do anyway), and I'll apply it when I see it.

And, BTW, Ctrl-R shows this in my history:
  git cherry-pick ..xanadu/pdf-pagination-fix
so I've already applied PR 63; I'll just ignore github and
believe what I find in xanadu.

Here's that patch:

/opt/lmi/src/lmi[0]$git --no-pager diff
diff --git a/basic_values.hpp b/basic_values.hpp
index 94ec44021..b7563e5db 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -269,8 +269,8 @@ class LMI_SO BasicValues
         (std::string const& TableFile
         ,e_database_key     TableID
         ,bool               IsTableValid    = true
-        ,EBlend      const  CanBlendSmoking = CannotBlend
-        ,EBlend      const  CanBlendGender  = CannotBlend
+        ,EBlend             CanBlendSmoking = CannotBlend
+        ,EBlend             CanBlendGender  = CannotBlend
         ) const;
 
     std::vector<double> const& GetBandedCoiRates
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 9e47e4731..26ae3c10a 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -1615,8 +1615,8 @@ std::vector<double> BasicValues::GetTable
     (std::string const& TableFile
     ,e_database_key     TableID
     ,bool               IsTableValid
-    ,EBlend      const  CanBlendSmoking
-    ,EBlend      const  CanBlendGender
+    ,EBlend             CanBlendSmoking
+    ,EBlend             CanBlendGender
     ) const
 {
     if(!IsTableValid)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]