]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Mitigate GCC 5.x optmizer issue in asiolink
authorThomas Markwalder <tmark@isc.org>
Tue, 5 Apr 2016 12:50:20 +0000 (08:50 -0400)
committerThomas Markwalder <tmark@isc.org>
Tue, 5 Apr 2016 12:50:20 +0000 (08:50 -0400)
    Merged in trac4243.

1  2 
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp6/dhcp6_srv.cc
src/lib/asiolink/tests/tcp_socket_unittest.cc
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc

Simple merge
Simple merge
index 4f282240298cdbfb6e56c9fcf3ad27473ecc7ba9,558764fafd6bb4df21a51011937b47ff7f13aa8a..a01a54457c06fdf4aa4e4eeb6a642e11209c96c5
  #include <dhcpsrv/tests/test_utils.h>
  #include <dhcpsrv/tests/generic_lease_mgr_unittest.h>
  #include <util/pid_file.h>
 +#include <util/range_utilities.h>
  #include <util/stopwatch.h>
- #include <gtest/gtest.h>
  
  #include <boost/bind.hpp>
+ #include <gtest/gtest.h>
  
  #include <cstdlib>
  #include <iostream>