Changes in / [314:2cc60866a0c9:315:c175e387da19] in lemon-main

Files:

• Makefile.am (modified) (2 diffs)
• README (modified) (1 diff)
• benchmark/Makefile.am (deleted)
• configure.ac (modified) (2 diffs)
• demo/arg_parser_demo.cc (modified) (1 diff)
• lemon/arg_parser.cc (modified) (1 diff)
• lemon/arg_parser.h (modified) (2 diffs)
• scripts/lemon-0.x-to-1.x.sh (deleted)
• tools/Makefile.am (modified) (1 diff)
• tools/lemon-0.x-to-1.x.sh (added)

Makefile.am

@@ -25 +25 @@
 bin_PROGRAMS =
 check_PROGRAMS =
+dist_bin_SCRIPTS =
 TESTS =
 XFAIL_TESTS =
@@ -32 +33 @@
 include doc/Makefile.am
 include demo/Makefile.am
-include benchmark/Makefile.am
 include tools/Makefile.am
 

README

@@ -38 +38 @@
    Contains programs to check the integrity and correctness of LEMON.
 
-benchmark/
-  
-   Contains programs for measuring the performance of algorithms.
-
 tools/
 

configure.ac

@@ -82 +82 @@
 AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
 
-dnl Disable/enable building the benchmarks.
-AC_ARG_ENABLE([benchmark],
-AS_HELP_STRING([--enable-benchmark], [build the benchmarks])
-AS_HELP_STRING([--disable-benchmark], [do not build the benchmarks @<:@default@:>@]),
-              [], [enable_benchmark=no])
-AC_MSG_CHECKING([whether to build the benchmarks])
-if test x"$enable_benchmark" != x"no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL([WANT_BENCHMARK], [test x"$enable_benchmark" != x"no"])
-
 dnl Checks for header files.
 AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
@@ -133 +120 @@
 #echo SOPLEX support................ : $lx_soplex_found
 #echo
-echo Build benchmarks.............. : $enable_benchmark
 echo Build demo programs........... : $enable_demo
 echo Build additional tools........ : $enable_tools

demo/arg_parser_demo.cc

@@ -28 +28 @@
 
 using namespace lemon;
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
   // Initialize the argument parser

lemon/arg_parser.cc

@@ -27 +27 @@
   }
 
-  ArgParser::ArgParser(int argc, const char **argv) :_argc(argc), _argv(argv),
-                                                     _command_name(argv[0]) {
+  ArgParser::ArgParser(int argc, const char * const *argv)
+    :_argc(argc), _argv(argv), _command_name(argv[0]) {
     funcOption("-help","Print a short help message",_showHelp,this);
     synonym("help","-help");
     synonym("h","-help");
-
   }
 

lemon/arg_parser.h

@@ -47 +47 @@
 
     int _argc;
-    const char **_argv;
+    const char * const *_argv;
 
     enum OptType { UNKNOWN=0, BOOL=1, STRING=2, DOUBLE=3, INTEGER=4, FUNC=5 };
@@ -120 +120 @@
 
     ///Constructor
-    ArgParser(int argc, const char **argv);
+    ArgParser(int argc, const char * const *argv);
 
     ~ArgParser();

tools/Makefile.am

@@ -2 +2 @@
 
 bin_PROGRAMS +=
+dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh
 
 endif WANT_TOOLS