[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 6b93e91 11/12: Remove an unneeded auxiliary f
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 6b93e91 11/12: Remove an unneeded auxiliary function |
Date: |
Tue, 22 May 2018 17:09:23 -0400 (EDT) |
branch: master
commit 6b93e91d9ae71d74998c2f1cc42cd87a0823ba22
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Remove an unneeded auxiliary function
---
wx_table_generator.cpp | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/wx_table_generator.cpp b/wx_table_generator.cpp
index f54a0a9..a255c3b 100644
--- a/wx_table_generator.cpp
+++ b/wx_table_generator.cpp
@@ -186,22 +186,6 @@ class wx_table_generator::column_info
bool const is_elastic_;
};
-namespace
-{
-
-/// Increase the first argument to the second one if it's smaller.
-
-template<typename T>
-void increase_to_if_smaller(T& first, T second)
-{
- if(first < second)
- {
- first = second;
- }
-}
-
-} // Unnamed namespace.
-
wx_table_generator::wx_table_generator
(group_quote_style_tag // tag not referenced
,std::vector<column_parameters> const& vc
@@ -319,7 +303,7 @@ LMI_ASSERT(h / lh == int(1u + count_newlines(z.header)));
LMI_ASSERT(std::size_t(h / lh) == 1u + count_newlines(z.header));
// Store number of lines used by tallest unhidden header:
// output_headers() uses it to write all headers as a block.
- increase_to_if_smaller(max_header_lines_, std::size_t(h / lh));
+ max_header_lines_ = std::max(max_header_lines_, std::size_t(h / lh));
switch(z.elasticity)
{
- [lmi-commits] [lmi] master updated (a1f29ab -> 40a94aa), Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master b219dd9 01/12: Note a possible future return-type change, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master b725bcb 05/12: Reorder PDF column parameters, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 2c95260 07/12: Prefer 'switch' to 'if' for a two-valued enum, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master bd86afe 04/12: Shorten an enumerator's name, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 9e1ac25 09/12: Fold a "ternary" conditional into a switch, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 40a94aa 12/12: Explain why width of an elastic column is initialized to zero, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 6b93e91 11/12: Remove an unneeded auxiliary function,
Greg Chicares <=
- [lmi-commits] [lmi] master b232274 02/12: Make column elasticity enumerative rather than boolean, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 7e64de5 03/12: Make column alignment enumerative rather than boolean, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master e2e4ad6 08/12: Remove a temporary assertion that is no longer useful, Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 637d535 06/12: Rework PDF column formatting in terms of "elasticity", Greg Chicares, 2018/05/22
- [lmi-commits] [lmi] master 6076b33 10/12: Simplify code; rewrite documentation, Greg Chicares, 2018/05/22