BIND 10 trac2726, updated. 56e4d09d7b49fa6322c3ed52a2c38898d8a27046 [2726] Remove unused method

[BIND 10 source code commits]

The branch, trac2726 has been updated
       via  56e4d09d7b49fa6322c3ed52a2c38898d8a27046 (commit)
       via  f7b60d9d56ce0447fad6f6b6ac241477535e7235 (commit)
       via  ed508fe48ff9a13463ef0bf800a74f7a9dec14f6 (commit)
      from  5543f4c43126a4477807ab2c043907cab8f7b04b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56e4d09d7b49fa6322c3ed52a2c38898d8a27046
Author: Michal 'vorner' Vaner <vorner at vorner.cz>
Date:   Wed Jun 12 12:13:28 2013 +0200

    [2726] Remove unused method

commit f7b60d9d56ce0447fad6f6b6ac241477535e7235
Author: Michal 'vorner' Vaner <vorner at vorner.cz>
Date:   Wed Jun 12 12:09:41 2013 +0200

    [2726] Suppress false positive cppcheck warning

commit ed508fe48ff9a13463ef0bf800a74f7a9dec14f6
Author: Michal 'vorner' Vaner <vorner at vorner.cz>
Date:   Wed Jun 12 12:06:20 2013 +0200

    [2726] Suppress cppcheck warning

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/tests/factory_unittest.cc |    2 ++
 src/lib/dhcp/option_custom.h              |    2 ++
 src/lib/dhcp/option_definition.cc         |    8 --------
 src/lib/dhcp/option_definition.h          |    9 ---------
 4 files changed, 4 insertions(+), 17 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/factory_unittest.cc b/src/lib/datasrc/tests/factory_unittest.cc
index 5a01a27..2708e0e 100644
--- a/src/lib/datasrc/tests/factory_unittest.cc
+++ b/src/lib/datasrc/tests/factory_unittest.cc
@@ -39,6 +39,8 @@ void
 pathtestHelper(const std::string& file, const std::string& expected_error) {
     std::string error;
     try {
+        // cppcheck-suppress unusedScopedObject We just check if it throws
+        // to create, not use it. That's OK.
         DataSourceClientContainer(file, ElementPtr());
     } catch (const DataSourceLibraryError& dsle) {
         error = dsle.what();
diff --git a/src/lib/dhcp/option_custom.h b/src/lib/dhcp/option_custom.h
index e0314ae..92d09b5 100644
--- a/src/lib/dhcp/option_custom.h
+++ b/src/lib/dhcp/option_custom.h
@@ -309,6 +309,8 @@ private:
     /// @tparam data type to be validated.
     ///
     /// @throw isc::dhcp::InvalidDataType if the type is invalid.
+    //cppcheck-suppress unusedPrivateFunction It's used, confusion because of
+    //templates
     template<typename T>
     void checkDataType(const uint32_t index) const;
 
diff --git a/src/lib/dhcp/option_definition.cc b/src/lib/dhcp/option_definition.cc
index 9db99f4..bf2c5fb 100644
--- a/src/lib/dhcp/option_definition.cc
+++ b/src/lib/dhcp/option_definition.cc
@@ -228,14 +228,6 @@ OptionDefinition::optionFactory(Option::Universe u, uint16_t type,
 }
 
 void
-OptionDefinition::sanityCheckUniverse(const Option::Universe expected_universe,
-                                      const Option::Universe actual_universe) {
-    if (expected_universe != actual_universe) {
-        isc_throw(isc::BadValue, "invalid universe specified for the option");
-    }
-}
-
-void
 OptionDefinition::validate() const {
 
     using namespace boost::algorithm;
diff --git a/src/lib/dhcp/option_definition.h b/src/lib/dhcp/option_definition.h
index 0aa0e17..dcfc3c7 100644
--- a/src/lib/dhcp/option_definition.h
+++ b/src/lib/dhcp/option_definition.h
@@ -501,15 +501,6 @@ private:
     void writeToBuffer(const std::string& value, const OptionDataType type,
                        OptionBuffer& buf) const;
 
-    /// @brief Sanity check universe value.
-    ///
-    /// @param expected_universe expected universe value.
-    /// @param actual_universe actual universe value.
-    ///
-    /// @throw isc::BadValue if expected universe and actual universe don't match.
-   static inline void sanityCheckUniverse(const Option::Universe expected_universe,
-                                          const Option::Universe actual_universe);
-
     /// Option name.
     std::string name_;
     /// Option code.