BIND 10 trac2545, updated. 28a43fa59ffd4f772104a76e3636b8c54b329aa3 [2545] Moved global storages to the anonymous namespace.

[BIND 10 source code commits]

The branch, trac2545 has been updated
       via  28a43fa59ffd4f772104a76e3636b8c54b329aa3 (commit)
      from  9065335de2f05d3bc1d874b933ba80b51feb68f6 (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 28a43fa59ffd4f772104a76e3636b8c54b329aa3
Author: Marcin Siodelski <marcin at isc.org>
Date:   Fri Dec 21 13:30:41 2012 +0100

    [2545] Moved global storages to the anonymous namespace.

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

Summary of changes:
 src/bin/dhcp4/config_parser.cc |    6 ++++++
 src/bin/dhcp4/config_parser.h  |    9 ++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/config_parser.cc b/src/bin/dhcp4/config_parser.cc
index 1f03c9f..1a5ffb6 100644
--- a/src/bin/dhcp4/config_parser.cc
+++ b/src/bin/dhcp4/config_parser.cc
@@ -59,6 +59,12 @@ typedef Dhcp4ConfigParser* ParserFactory(const std::string& config_id);
 /// @brief a collection of factories that creates parsers for specified element names
 typedef std::map<std::string, ParserFactory*> FactoryMap;
 
+/// @brief a collection of elements that store uint32 values (e.g. renew-timer = 900)
+typedef std::map<std::string, uint32_t> Uint32Storage;
+
+/// @brief a collection of elements that store string values
+typedef std::map<std::string, std::string> StringStorage;
+
 /// @brief Storage for parsed boolean values.
 typedef std::map<string, bool> BooleanStorage;
 
diff --git a/src/bin/dhcp4/config_parser.h b/src/bin/dhcp4/config_parser.h
index 0adfb36..f18d07d 100644
--- a/src/bin/dhcp4/config_parser.h
+++ b/src/bin/dhcp4/config_parser.h
@@ -28,12 +28,6 @@ namespace dhcp {
 
 class Dhcpv4Srv;
 
-/// @brief a collection of elements that store uint32 values (e.g. renew-timer = 900)
-typedef std::map<std::string, uint32_t> Uint32Storage;
-
-/// @brief a collection of elements that store string values
-typedef std::map<std::string, std::string> StringStorage;
-
 /// An exception that is thrown if an error occurs while configuring an
 /// @c Dhcpv4Srv object.
 class Dhcp4ConfigError : public isc::Exception {
@@ -69,7 +63,8 @@ public:
 /// reconfiguration statuses. It may return the following response codes:
 /// 0 - configuration successful
 /// 1 - malformed configuration (parsing failed)
-/// 2 - logical error (parsing was successful, but the values are invalid)
+/// 2 - commit failed (parsing was successful, but failed to store the
+/// values in to server's configuration)
 ///
 /// @param config_set a new configuration (JSON) for DHCPv4 server
 /// @return answer that contains result of reconfiguration