From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 26 Sep 2012 07:58:50 +0000 (+0200)
Subject: [master] Merge branch 'trac1960'
X-Git-Tag: trac2351_base~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c192e5c0903f349b4d80cf2bb6cd964040ae7da;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1960'

Conflicts:
	tests/tools/perfdhcp/Makefile.am
	tests/tools/perfdhcp/tests/command_options_unittest.cc
---

6c192e5c0903f349b4d80cf2bb6cd964040ae7da
diff --cc tests/tools/perfdhcp/Makefile.am
index 816eeeb270,3ad4e9ae26..08a21a4c2d
--- a/tests/tools/perfdhcp/Makefile.am
+++ b/tests/tools/perfdhcp/Makefile.am
@@@ -18,30 -17,24 +17,28 @@@ if USE_STATIC_LIN
  AM_LDFLAGS += -static
  endif
  
- pkglibexec_PROGRAMS = perfdhcp2
- perfdhcp2_SOURCES = main.cc
- perfdhcp2_SOURCES += command_options.cc command_options.h
- perfdhcp2_SOURCES += localized_option.h
- perfdhcp2_SOURCES += perf_pkt6.cc perf_pkt6.h
- perfdhcp2_SOURCES += perf_pkt4.cc perf_pkt4.h
- perfdhcp2_SOURCES += pkt_transform.cc pkt_transform.h
- perfdhcp2_SOURCES += stats_mgr.h
- perfdhcp2_SOURCES += test_control.cc test_control.h
 -pkglibexec_PROGRAMS = perfdhcp
++bin_PROGRAMS = perfdhcp
+ perfdhcp_SOURCES = main.cc
+ perfdhcp_SOURCES += command_options.cc command_options.h
+ perfdhcp_SOURCES += localized_option.h
+ perfdhcp_SOURCES += perf_pkt6.cc perf_pkt6.h
+ perfdhcp_SOURCES += perf_pkt4.cc perf_pkt4.h
+ perfdhcp_SOURCES += pkt_transform.cc pkt_transform.h
+ perfdhcp_SOURCES += stats_mgr.h
+ perfdhcp_SOURCES += test_control.cc test_control.h
  libb10_perfdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
  
- perfdhcp2_CXXFLAGS = $(AM_CXXFLAGS)
+ perfdhcp_CXXFLAGS = $(AM_CXXFLAGS)
  if USE_CLANGPP
  # Disable unused parameter warning caused by some of the
  # Boost headers when compiling with clang.
- perfdhcp2_CXXFLAGS += -Wno-unused-parameter
+ perfdhcp_CXXFLAGS += -Wno-unused-parameter
  endif
  
- perfdhcp2_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
- perfdhcp2_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
- perfdhcp2_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+ perfdhcp_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+ perfdhcp_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+ perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
 +
- #pkglibexec_PROGRAMS  = perfdhcp
- #perfdhcp_SOURCES  = perfdhcp.c
 +
 +# ... and the documentation
- EXTRA_DIST = perfdhcp_internals.dox
++EXTRA_DIST = perfdhcp_internals.dox
diff --cc tests/tools/perfdhcp/test_control.h
index f89a7bea68,1a29d093c9..26c0c0b692
--- a/tests/tools/perfdhcp/test_control.h
+++ b/tests/tools/perfdhcp/test_control.h
@@@ -138,13 -181,9 +181,13 @@@ public
      /// This is default numbers generator class. The member function is
      /// used to generate uint32_t values. Other generator classes should
      /// derive from this one to implement generation algorithms
-     /// (e.g. sequencial or based on random function).
+     /// (e.g. sequential or based on random function).
      class NumberGenerator {
      public:
 +
 +        /// \brief Destructor.
 +        virtual ~NumberGenerator() { }
 +
          /// \brief Generate number.
          ///
          /// \return Generate number.