- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Moved another declaration into a smaller scope.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 6d5f32d30f3dc5494aff61bf04cb27c56903150e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6d5f32d30f3d… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 21:42:56 2012 +0000 Moved another declaration into a smaller scope. Detected by ECLAIR service minscope. --- src/ppl-config.cc.in | 64 +++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 005e712..167d515 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -126,38 +126,6 @@ bool required_credits = false; unsigned num_required_items = 0; -#ifdef PPL_HAVE_GETOPT_H -struct option long_options[] = { - {"help", no_argument, 0, 'h'}, - {"format", required_argument, 0, 'F'}, - {"interface", required_argument, 0, 'I'}, - {"application", no_argument, 0, 'A'}, - {"library", no_argument, 0, 'L'}, - {"prefix", optional_argument, 0, 'p'}, - {"exec-prefix", optional_argument, 0, 'e'}, - {"configure-options", no_argument, 0, 'O'}, - {"version", no_argument, 0, 'V'}, - {"version-major", no_argument, 0, 'M'}, - {"version-minor", no_argument, 0, 'N'}, - {"version-revision", no_argument, 0, 'R'}, - {"version-beta", no_argument, 0, 'B'}, - {"banner", no_argument, 0, 'E'}, - {"coefficients", no_argument, 0, 'n'}, - {"includedir", no_argument, 0, 'i'}, - {"bindir", no_argument, 0, 'b'}, - {"libdir", no_argument, 0, 'l'}, - {"cppflags", no_argument, 0, 'P'}, - {"cflags", no_argument, 0, 'C'}, - {"cxxflags", no_argument, 0, 'X'}, - {"ldflags", no_argument, 0, 'D'}, - {"license", no_argument, 0, 'g'}, - {"copying", no_argument, 0, 'c'}, - {"bugs", no_argument, 0, 'u'}, - {"credits", no_argument, 0, 'r'}, - {0, 0, 0, 0} -}; -#endif - #define OPTION_LETTERS "hF:I:ALp::e::OVMNRBEniblPCXDgcur" @@ -213,6 +181,38 @@ process_options(int argc, char* argv[]) { bool exec_prefix_set = false; +#ifdef PPL_HAVE_GETOPT_H +struct option long_options[] = { + {"help", no_argument, 0, 'h'}, + {"format", required_argument, 0, 'F'}, + {"interface", required_argument, 0, 'I'}, + {"application", no_argument, 0, 'A'}, + {"library", no_argument, 0, 'L'}, + {"prefix", optional_argument, 0, 'p'}, + {"exec-prefix", optional_argument, 0, 'e'}, + {"configure-options", no_argument, 0, 'O'}, + {"version", no_argument, 0, 'V'}, + {"version-major", no_argument, 0, 'M'}, + {"version-minor", no_argument, 0, 'N'}, + {"version-revision", no_argument, 0, 'R'}, + {"version-beta", no_argument, 0, 'B'}, + {"banner", no_argument, 0, 'E'}, + {"coefficients", no_argument, 0, 'n'}, + {"includedir", no_argument, 0, 'i'}, + {"bindir", no_argument, 0, 'b'}, + {"libdir", no_argument, 0, 'l'}, + {"cppflags", no_argument, 0, 'P'}, + {"cflags", no_argument, 0, 'C'}, + {"cxxflags", no_argument, 0, 'X'}, + {"ldflags", no_argument, 0, 'D'}, + {"license", no_argument, 0, 'g'}, + {"copying", no_argument, 0, 'c'}, + {"bugs", no_argument, 0, 'u'}, + {"credits", no_argument, 0, 'r'}, + {0, 0, 0, 0} +}; +#endif + static const char* usage_string = "Usage: %s [OPTION]...\n" "Displays information, in various formats, about an installation\n"

1 0

[GIT] ppl/ppl(master): Multiple-inclusion guards added.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 1b2e1e5fa3b8a93544d30b53dd6f2bc27bee8eda URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b2e1e5fa3b8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 20:22:32 2012 +0100 Multiple-inclusion guards added. Detected by ECLAIR service inclgard. --- src/Makefile.am | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6e84ad1..31844cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -578,20 +578,31 @@ ppl.hh: $(top_builddir)/ppl-config.h $(top_builddir)/src/version.hh ppl_header.h $(top_srcdir)/src/ppl_header.hh >$@ BUGS.hh: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/BUGS + @echo "#ifndef PPL_BUGS_hh" >$@ + @echo "#define PPL_BUGS_hh 1" >>$@ $(top_builddir)/utils/text2cxxarray --name=BUGS_array --decl-only \ - $(top_srcdir)/BUGS >$@ + $(top_srcdir)/BUGS >>$@ + @echo "#endif // !defined(PPL_BUGS_hh)" >>$@ BUGS.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/BUGS $(top_builddir)/utils/text2cxxarray --name=BUGS_array \ $(top_srcdir)/BUGS >$@ + COPYING.hh: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/COPYING + @echo "#ifndef PPL_COPYING_hh" >$@ + @echo "#define PPL_COPYING_hh 1" >>$@ $(top_builddir)/utils/text2cxxarray --name=COPYING_array --decl-only \ - $(top_srcdir)/COPYING >$@ + $(top_srcdir)/COPYING >>$@ + @echo "#endif // !defined(PPL_COPYING_hh)" >>$@ + COPYING.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/COPYING $(top_builddir)/utils/text2cxxarray --name=COPYING_array \ $(top_srcdir)/COPYING >$@ CREDITS.hh: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/CREDITS + @echo "#ifndef PPL_CREDITS_hh" >$@ + @echo "#define PPL_CREDITS_hh 1" >>$@ $(top_builddir)/utils/text2cxxarray --name=CREDITS_array --decl-only \ - $(top_srcdir)/CREDITS >$@ + $(top_srcdir)/CREDITS >>$@ + @echo "#endif // !defined(PPL_CREDITS_hh)" >>$@ CREDITS.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/CREDITS $(top_builddir)/utils/text2cxxarray --name=CREDITS_array \ $(top_srcdir)/CREDITS >$@

1 0

[GIT] ppl/ppl(master): Avoided functional cast. Detected by ECLAIR service castexpr.
by Abramo Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: c3b39224715d165d8965d93f3a51fd4d12d0dcb8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c3b39224715d… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Feb 21 17:28:31 2012 +0100 Avoided functional cast. Detected by ECLAIR service castexpr. --- src/checked_int.inlines.hh | 8 ++++---- src/ppl-config.cc.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index ffcc55a..c8e3c3a 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -364,7 +364,7 @@ assign_signed_int_signed_int(To& to, const From from, Rounding_Dir dir) { PPL_GT_SILENT(from, From(Extended_Int<To_Policy, To>::max)))) return set_pos_overflow_int<To_Policy>(to, dir); } - to = To(from); + to = static_cast<To>(from); return V_EQ; } @@ -376,7 +376,7 @@ assign_signed_int_unsigned_int(To& to, const From from, Rounding_Dir dir) { from > From(Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); } - to = To(from); + to = static_cast<To>(from); return V_EQ; } @@ -390,7 +390,7 @@ assign_unsigned_int_signed_int(To& to, const From from, Rounding_Dir dir) { from > From(Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); } - to = To(from); + to = static_cast<To>(from); return V_EQ; } @@ -404,7 +404,7 @@ assign_unsigned_int_unsigned_int(To& to, const From from, Rounding_Dir dir) { PPL_GT_SILENT(from, From(Extended_Int<To_Policy, To>::max)))) return set_pos_overflow_int<To_Policy>(to, dir); } - to = To(from); + to = static_cast<To>(from); return V_EQ; } diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index f8c5481..b494a1f 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -619,16 +619,16 @@ main(int argc, char* argv[]) try { portray("VERSION", PPL_VERSION); if (required_version_major) - portray("VERSION_MAJOR", long(PPL_VERSION_MAJOR)); + portray("VERSION_MAJOR", static_cast<long>(PPL_VERSION_MAJOR)); if (required_version_minor) - portray("VERSION_MINOR", long(PPL_VERSION_MINOR)); + portray("VERSION_MINOR", static_cast<long>(PPL_VERSION_MINOR)); if (required_version_revision) - portray("VERSION_REVISION", long(PPL_VERSION_REVISION)); + portray("VERSION_REVISION", static_cast<long>(PPL_VERSION_REVISION)); if (required_version_beta) - portray("VERSION_BETA", long(PPL_VERSION_BETA)); + portray("VERSION_BETA", static_cast<long>(PPL_VERSION_BETA)); if (required_banner) portray("BANNER", PPL::banner());

1 0

[GIT] ppl/ppl(master): Avoid not needed virtual inheritance.
by Abramo Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 61afde75e7d72eff478a60815e11d3a4f442252a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=61afde75e7d7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Feb 21 17:19:11 2012 +0100 Avoid not needed virtual inheritance. --- src/Handler.defs.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler.defs.hh b/src/Handler.defs.hh index 29af88b..6914b09 100644 --- a/src/Handler.defs.hh +++ b/src/Handler.defs.hh @@ -58,7 +58,7 @@ public: */ template <typename Flag_Base, typename Flag> class Parma_Polyhedra_Library::Implementation::Watchdog::Handler_Flag - : virtual public Handler { + : public Handler { public: //! Constructor with a given function. Handler_Flag(const Flag_Base* volatile& holder, Flag& flag); @@ -75,7 +75,7 @@ private: //! A kind of Handler calling a given function. class Parma_Polyhedra_Library::Implementation::Watchdog::Handler_Function - : virtual public Handler { + : public Handler { public: //! Constructor with a given function. Handler_Function(void (*function)());

1 0

[GIT] ppl/ppl(master): Updated Doxygen configuration files to release 1.7.4 .
by Enea Zaffanella 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 2db3cb6ae4f889495dad47d46deff16b175191c7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2db3cb6ae4f8… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 21 16:55:58 2012 +0100 Updated Doxygen configuration files to release 1.7.4. --- doc/devref-language-interface.doxyconf.in | 20 +++++++++++++++++++- doc/devref.doxyconf-html.in | 20 +++++++++++++++++++- doc/devref.doxyconf-latex.in | 20 +++++++++++++++++++- doc/user-language-interface.doxyconf.in | 20 +++++++++++++++++++- doc/user.doxyconf-html.in | 20 +++++++++++++++++++- doc/user.doxyconf-latex.in | 20 +++++++++++++++++++- 6 files changed, 114 insertions(+), 6 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2db3cb6a…

1 0

[GIT] ppl/ppl(master): Added '&' prefix to function identifiers that are not used to call the function.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: bd2ce77bf9d603c397578ad077ef4d1a30f2afee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd2ce77bf9d6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 11:29:58 2012 +0000 Added '&' prefix to function identifiers that are not used to call the function. Detected by Eclair service funcalls. --- demos/ppl_lcdd/ppl_lcdd.cc | 2 +- src/Init.cc | 2 +- src/Watchdog.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index a4ebc92..d6f1b8e 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -1192,7 +1192,7 @@ main(int argc, char* argv[]) try { #ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME if (max_seconds_of_cpu_time > 0) - set_alarm_on_cpu_time(max_seconds_of_cpu_time, timeout); + set_alarm_on_cpu_time(max_seconds_of_cpu_time, &timeout); #endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) diff --git a/src/Init.cc b/src/Init.cc index 7b9c53f..8997598 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -140,7 +140,7 @@ PPL::Init::Init() { // ... the GMP memory allocation functions are set, ... ppl_set_GMP_memory_allocation_functions(); // ... the default output function for Variable objects is set, ... - Variable::set_output_function(Variable::default_output_function); + Variable::set_output_function(&Variable::default_output_function); // ... the Coefficient constants are initialized, ... Coefficient_constants_initialize(); // ... the Linear_Expression class is initialized, ... diff --git a/src/Watchdog.cc b/src/Watchdog.cc index 4651d63..504beee 100644 --- a/src/Watchdog.cc +++ b/src/Watchdog.cc @@ -237,7 +237,7 @@ PPL::Watchdog::initialize() { sigemptyset(&mask); struct sigaction s; - s.sa_handler = PPL_handle_timeout; + s.sa_handler = &PPL_handle_timeout; s.sa_mask = mask; s.sa_flags = 0; // Was SA_ONESHOT: why?

2 1

[GIT] ppl/ppl(master): When object is not used for control, declaration moved outside for statement.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 36a7eb86bbe88a5bd278495b3bfd435422245530 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=36a7eb86bbe8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 11:01:14 2012 +0000 When object is not used for control, declaration moved outside for statement. --- src/PIP_Tree.cc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 41ea946..77bd698 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -138,7 +138,7 @@ merge_assign(Matrix& x, const Constraint_System& y, if (inhomogeneous_term != 0) itr = x_i.insert(0, inhomogeneous_term); // itr may still be end() but it can still be used as a hint. - for ( dimension_type j = 1; pj != param_end; ++pj, ++j) { + for (dimension_type j = 1; pj != param_end; ++pj, ++j) { Variable vj(*pj); if (vj.space_dimension() > cs_space_dim) break; @@ -1133,12 +1133,13 @@ PIP_Tree_Node // Needed to avoid reallocations in expr when iterating upward. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); // The number of increments of j plus one. + dimension_type j_index = 1; Row::const_iterator i = row.begin(); Row::const_iterator i_end = row.end(); if (i != i_end && i.index() == 0) ++i; // NOTE: iterating in [1..num_params]. - for (dimension_type j_index = 1; i != i_end; ++i) { + for ( ; i != i_end; ++i) { PPL_ASSERT(i.index() <= parameters.size()); std::advance(j, i.index() - j_index); j_index = i.index(); @@ -3200,7 +3201,8 @@ PIP_Solution_Node::generate_cut(const dimension_type index, // To avoid reallocations of expr. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); Variables_Set::const_iterator p_j = parameters.begin(); - for ( dimension_type last_index = 1; j != j_end; ++j) { + dimension_type last_index = 1; + for ( ; j != j_end; ++j) { pos_mod_assign(mod, *j, denom); if (mod != 0) { // Optimizing computation: expr += (denom - mod) * Variable(*p_j);

1 0

[GIT] ppl/ppl(master): Declarations that can be moved into a smaller scope have been moved.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 1742962f7d14843cd437b9c4294468aa74e543f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1742962f7d14… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 08:20:09 2012 +0000 Declarations that can be moved into a smaller scope have been moved. Detected by ECLAIR service minscope. --- src/PIP_Tree.cc | 11 ++++------- src/Partially_Reduced_Product.templates.hh | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ae86937..41ea946 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -134,12 +134,11 @@ merge_assign(Matrix& x, const Constraint_System& y, Coefficient_traits::const_reference inhomogeneous_term = y_i->inhomogeneous_term(); Variables_Set::const_iterator pj = param_begin; - dimension_type j = 1; Row::iterator itr = x_i.end(); if (inhomogeneous_term != 0) itr = x_i.insert(0, inhomogeneous_term); // itr may still be end() but it can still be used as a hint. - for ( ; pj != param_end; ++pj, ++j) { + for ( dimension_type j = 1; pj != param_end; ++pj, ++j) { Variable vj(*pj); if (vj.space_dimension() > cs_space_dim) break; @@ -1134,13 +1133,12 @@ PIP_Tree_Node // Needed to avoid reallocations in expr when iterating upward. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); // The number of increments of j plus one. - dimension_type j_index = 1; Row::const_iterator i = row.begin(); Row::const_iterator i_end = row.end(); if (i != i_end && i.index() == 0) ++i; // NOTE: iterating in [1..num_params]. - for ( ; i != i_end; ++i) { + for (dimension_type j_index = 1; i != i_end; ++i) { PPL_ASSERT(i.index() <= parameters.size()); std::advance(j, i.index() - j_index); j_index = i.index(); @@ -3178,10 +3176,10 @@ PIP_Solution_Node::generate_cut(const dimension_type index, // Column index of already existing Artificial_Parameter. dimension_type ap_column = not_a_dimension(); - bool reuse_ap = false; if (generate_parametric_cut) { // Fractional parameter coefficient found: generate parametric cut. + bool reuse_ap = false; Linear_Expression expr; // Limiting the scope of reference row_t (may be later invalidated). @@ -3202,8 +3200,7 @@ PIP_Solution_Node::generate_cut(const dimension_type index, // To avoid reallocations of expr. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); Variables_Set::const_iterator p_j = parameters.begin(); - dimension_type last_index = 1; - for ( ; j != j_end; ++j) { + for ( dimension_type last_index = 1; j != j_end; ++j) { pos_mod_assign(mod, *j, denom); if (mod != 0) { // Optimizing computation: expr += (denom - mod) * Variable(*p_j); diff --git a/src/Partially_Reduced_Product.templates.hh b/src/Partially_Reduced_Product.templates.hh index 313ed8a..7e5b738 100644 --- a/src/Partially_Reduced_Product.templates.hh +++ b/src/Partially_Reduced_Product.templates.hh @@ -520,8 +520,8 @@ bool shrink_to_congruence_no_check(D1& d1, D2& d2, const Congruence& cg) { bool max_included; PPL_DIRTY_TEMP_COEFFICIENT(min_numer); PPL_DIRTY_TEMP_COEFFICIENT(min_denom); - bool min_included; if (d2.maximize(e, max_numer, max_denom, max_included)) { + bool min_included; if (d2.minimize(e, min_numer, min_denom, min_included)) { // Adjust values to allow for the denominators max_denom and min_denom. max_numer *= min_denom;

1 0

[GIT] ppl/ppl(master): Simplified.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: a00acbd1037dc7da2fff39884f185b06f2e2dabd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a00acbd1037d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 09:17:14 2012 +0100 Simplified. --- utils/text2cxxarray.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/utils/text2cxxarray.in b/utils/text2cxxarray.in index 4b2ea23..571e791 100644 --- a/utils/text2cxxarray.in +++ b/utils/text2cxxarray.in @@ -56,7 +56,7 @@ GetOptions( my @lines = <>; my $size = @lines + 1; -print "extern const char* const $array_name" . "[$size]"; +print "extern const char* const ${array_name}[$size]"; if (! $decl_only) { print " = {\n"; @@ -70,4 +70,5 @@ if (! $decl_only) { print " 0"; print "}"; } + print ";\n";

1 0

[GIT] ppl/ppl(master): Simplified.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: e42c3f3d8ad1a541eb102c3b4379b624e1645f9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e42c3f3d8ad1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 09:15:45 2012 +0100 Simplified. --- utils/text2cxxarray.in | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/utils/text2cxxarray.in b/utils/text2cxxarray.in index b79b7b5..4b2ea23 100644 --- a/utils/text2cxxarray.in +++ b/utils/text2cxxarray.in @@ -53,12 +53,8 @@ GetOptions( 'help|h' => \&usage, ) || usage(); -@lines = <>; - -my $size = 1; -foreach (@lines) { - $size = $size+1; -} +my @lines = <>; +my $size = @lines + 1; print "extern const char* const $array_name" . "[$size]";

1 0