[#1415] Do not use nested types

Removed Range and PrefixRange typedefs from FreeLeaseQueue and
IPRangePermutation. This prevents compilation failures with g++.

Author: msiodelski

src/lib/dhcpsrv/free_lease_queue.cc

@@ -24,7 +24,7 @@ FreeLeaseQueue::FreeLeaseQueue()
 }
 
 void
-FreeLeaseQueue::addRange(const Range& range) {
+FreeLeaseQueue::addRange(const AddressRange& range) {
     // If the container with ranges is empty, there are is no need for
     // doing any checks. Let's just add the new range.
     if (!containers_.empty()) {
@@ -36,7 +36,7 @@ FreeLeaseQueue::addRange(const Range& range) {
 
 void
 FreeLeaseQueue::addRange(const IOAddress& start, const IOAddress& end) {
-    addRange(FreeLeaseQueue::Range(start, end));
+    addRange(AddressRange(start, end));
 }
 
 void
@@ -52,7 +52,7 @@ FreeLeaseQueue::addRange(const PrefixRange& range) {
 void
 FreeLeaseQueue::addRange(const asiolink::IOAddress& prefix, const uint8_t prefix_length,
                          const uint8_t delegated_length) {
-    addRange(FreeLeaseQueue::PrefixRange(prefix, prefix_length, delegated_length));
+    addRange(PrefixRange(prefix, prefix_length, delegated_length));
 }
 
 bool
@@ -76,7 +76,7 @@ FreeLeaseQueue::append(const IOAddress& address) {
         return (false);
     }
     // Use the range we found and append the address to it.
-    FreeLeaseQueue::Range range(lb->range_start_, lb->range_end_);
+    AddressRange range(lb->range_start_, lb->range_end_);
     append(range, address);
 
     // Everything is fine.
@@ -105,15 +105,15 @@ FreeLeaseQueue::append(const IOAddress& prefix, const uint8_t delegated_length)
         return (false);
     }
     // Use the range we found and append the prefix to it.
-    FreeLeaseQueue::PrefixRange range(lb->range_start_, lb->range_end_, lb->delegated_length_);
+    PrefixRange range(lb->range_start_, lb->range_end_, lb->delegated_length_);
     append(range, prefix);
 
     // Everything is fine.
     return (true);
 }
 
 void
-FreeLeaseQueue::append(const FreeLeaseQueue::Range& range, const IOAddress& address) {
+FreeLeaseQueue::append(const AddressRange& range, const IOAddress& address) {
     // Make sure the address is within the range boundaries.
     checkRangeBoundaries(range, address);
     auto cont = getContainer(range);
@@ -131,14 +131,14 @@ FreeLeaseQueue::append(const uint64_t range_index, const IOAddress& ip) {
 }
 
 void
-FreeLeaseQueue::append(const FreeLeaseQueue::PrefixRange& range, const asiolink::IOAddress& prefix) {
+FreeLeaseQueue::append(const PrefixRange& range, const asiolink::IOAddress& prefix) {
     checkRangeBoundaries(range, prefix, true);
     auto cont = getContainer(range);
     cont->insert(prefix);
 }
 
 bool
-FreeLeaseQueue::use(const FreeLeaseQueue::Range& range, const IOAddress& address) {
+FreeLeaseQueue::use(const AddressRange& range, const IOAddress& address) {
     checkRangeBoundaries(range, address);
     auto cont = getContainer(range);
     auto found = cont->find(address);
@@ -150,7 +150,7 @@ FreeLeaseQueue::use(const FreeLeaseQueue::Range& range, const IOAddress& address
 }
 
 bool
-FreeLeaseQueue::use(const FreeLeaseQueue::PrefixRange& range, const IOAddress& prefix) {
+FreeLeaseQueue::use(const PrefixRange& range, const IOAddress& prefix) {
     checkRangeBoundaries(range, prefix, true);
     auto cont = getContainer(range);
     auto found = cont->find(prefix);
@@ -216,7 +216,7 @@ FreeLeaseQueue::checkRangeOverlaps(const IOAddress& start, const IOAddress& end)
 
 
 FreeLeaseQueue::ContainerPtr
-FreeLeaseQueue::getContainer(const FreeLeaseQueue::Range& range) const {
+FreeLeaseQueue::getContainer(const AddressRange& range) const {
     auto cont = containers_.find(range.start_);
     if (cont == containers_.end()) {
         isc_throw(BadValue, "conatiner for the specified address range " << range.start_
@@ -226,7 +226,7 @@ FreeLeaseQueue::getContainer(const FreeLeaseQueue::Range& range) const {
 }
 
 FreeLeaseQueue::ContainerPtr
-FreeLeaseQueue::getContainer(const FreeLeaseQueue::PrefixRange& range) const {
+FreeLeaseQueue::getContainer(const PrefixRange& range) const {
     auto cont = containers_.find(range.start_);
     if (cont == containers_.end()) {
         isc_throw(BadValue, "conatiner for the specified prefix " << range.start_

src/lib/dhcpsrv/free_lease_queue.h

@@ -76,12 +76,6 @@ namespace dhcp {
 class FreeLeaseQueue {
 public:
 
-    /// @brief Structure representing address range in the @c FreeLeaseQueue.
-    typedef AddressRange Range;
-
-    /// @brief Structure representing delegated prefix range in @c FreeLeaseQueue.
-    typedef PrefixRange PrefixRange;
-
     /// @brief Constructor.
     FreeLeaseQueue();
 
@@ -91,7 +85,7 @@ class FreeLeaseQueue {
     ///
     /// @param range the new range to be added.
     /// @throw BadValue if the new range overlaps with any of the existing ranges.
-    void addRange(const Range& range);
+    void addRange(const AddressRange& range);
 
     /// @brief Adds new address range to the container.
     ///
@@ -169,7 +163,7 @@ class FreeLeaseQueue {
     /// @param address address to be appended to the range queue.
     /// @throw BadValue if the address does not belong to the specified
     /// range or if the given range does not exist.
-    void append(const Range& range, const asiolink::IOAddress& address);
+    void append(const AddressRange& range, const asiolink::IOAddress& address);
 
     /// @brief Appends a prefix at the end of the queue for a range.
     ///
@@ -209,7 +203,7 @@ class FreeLeaseQueue {
     /// @return true if the address was found and successfully removed,
     /// false otherwise.
     /// @throw BadValue if the range does not exist.
-    bool use(const Range& range, const asiolink::IOAddress& address);
+    bool use(const AddressRange& range, const asiolink::IOAddress& address);
 
     /// @brief Removes the specified delegated prefix from the free prefixes.
     ///
@@ -228,7 +222,7 @@ class FreeLeaseQueue {
     /// for the range.
     ///
     /// @param range range for which next address is to be returned.
-    /// @tparam RangeType type of the range, i.e. @c Range or @c PrefixRange.
+    /// @tparam RangeType type of the range, i.e. @c AddressRange or @c PrefixRange.
     /// @return Next free address or delegated prefix in that range.
     /// @throw BadValue if the range does not exist.
     template<typename RangeType>
@@ -243,7 +237,7 @@ class FreeLeaseQueue {
     /// should be appended to the queue using the @c append method.
     ///
     /// @param range range for which next address or prefix is to be returned.
-    /// @tparam RangeType type of the range, i.e. @c Range or @c PrefixRange.
+    /// @tparam RangeType type of the range, i.e. @c AddressRange or @c PrefixRange.
     /// @return Next free address or delegated prefix in that range.
     /// @throw BadValue if the range does not exist.
     template<typename RangeType>
@@ -258,7 +252,7 @@ class FreeLeaseQueue {
     /// range itself because it uses random access index.
     ///
     /// @param range range which index is to be returned.
-    /// @tparam RangeType type of the range, i.e. @c Range or PrefixRange.
+    /// @tparam RangeType type of the range, i.e. @c AddressRange or PrefixRange.
     /// @return range index.
     /// @throw BadValue if the range does not exist.
     template<typename RangeType>
@@ -333,7 +327,7 @@ class FreeLeaseQueue {
     /// @param ip address or delegated prefix for which the check should be performed.
     /// @param prefix boolean value indicating if the specified IP is an address or
     /// delegated prefix - used in error logging.
-    /// @tparam RangeType type of the range used, i.e. @c Range or @c PrefixRange.
+    /// @tparam RangeType type of the range used, i.e. @c AddressRange or @c PrefixRange.
     /// @throw BadValue of the address or delegated prefix does not belong to the range.
     template<typename RangeType>
     void checkRangeBoundaries(const RangeType& range, const asiolink::IOAddress& ip,
@@ -353,7 +347,7 @@ class FreeLeaseQueue {
     /// @param range range for which the container should be returned.
     /// @return Pointer to the container (if found).
     /// @throw BadValue if the specified range does not exist.
-    ContainerPtr getContainer(const Range& range) const;
+    ContainerPtr getContainer(const AddressRange& range) const;
 
     /// @brief Returns container for a given prefix range.
     ///

src/lib/dhcpsrv/ip_range_permutation.cc

@@ -15,14 +15,14 @@ using namespace isc::asiolink;
 namespace isc {
 namespace dhcp {
 
-IPRangePermutation::IPRangePermutation(const IPRangePermutation::Range& range)
+IPRangePermutation::IPRangePermutation(const AddressRange& range)
     : range_start_(range.start_), step_(1), cursor_(addrsInRange(range_start_, range.end_) - 1),
       state_(), done_(false), generator_() {
     std::random_device rd;
     generator_.seed(rd());
 }
 
-IPRangePermutation::IPRangePermutation(const IPRangePermutation::PrefixRange& range)
+IPRangePermutation::IPRangePermutation(const PrefixRange& range)
     : range_start_(range.start_), step_(static_cast<uint64_t>(1) << (128 - range.delegated_length_)),
       cursor_(prefixesInRange(range.prefix_length_, range.delegated_length_) - 1),
       state_(), done_(false), generator_() {

src/lib/dhcpsrv/ip_range_permutation.h

@@ -63,16 +63,10 @@ namespace dhcp {
 class IPRangePermutation {
 public:
 
-    /// Address range.
-    typedef AddressRange Range;
-
-    /// Prefix range.
-    typedef PrefixRange PrefixRange;
-
     /// @brief Constructor for address ranges.
     ///
     /// @param range address range for which the permutation will be generated.
-    IPRangePermutation(const Range& range);
+    IPRangePermutation(const AddressRange& range);
 
     /// @brief Constructor for prefix ranges.
     ///