Small code improvements

diff --git a/src/config/option/hostconfigurationoption.cpp b/src/config/option/hostconfigurationoption.cpp
index f08ecee..9116eac 100644 (file)
--- a/src/config/option/hostconfigurationoption.cpp
+++ b/src/config/option/hostconfigurationoption.cpp
@@ -74,7 +74,8 @@ HostConfigurationOption::~HostConfigurationOption()
  */
 size_t HostConfigurationOption::get_hosts_count() const
 {
-    // ensure set_hosts_count was called first
+    // ensure that the set_hosts_count() was called first, in other words,
+    // set_hosts_count() MUST be called before get_hosts_count()
     BOOST_ASSERT( HostsCount != invalid_host_count );
 
     return HostsCount;

diff --git a/src/config/option/hostpingintervaloption.cpp b/src/config/option/hostpingintervaloption.cpp
index a1b6ecc..5d7ef3d 100644 (file)
--- a/src/config/option/hostpingintervaloption.cpp
+++ b/src/config/option/hostpingintervaloption.cpp
@@ -51,7 +51,7 @@ HostPingIntervalOption::~HostPingIntervalOption()
 
 bool HostPingIntervalOption::validate( const variables_map& vm ) const
 {
-    bool is_valid = ( vm.count( this->get_command_string() ) > 0 );
+    bool is_valid = ( vm.count( get_command_string() ) > 0 );
 
     return is_valid;
 }

diff --git a/src/config/option/hostpingprotocoloption.cpp b/src/config/option/hostpingprotocoloption.cpp
index 5993aaa..d725feb 100644 (file)
--- a/src/config/option/hostpingprotocoloption.cpp
+++ b/src/config/option/hostpingprotocoloption.cpp
@@ -51,7 +51,7 @@ HostPingProtocolOption::~HostPingProtocolOption()
 
 bool HostPingProtocolOption::validate( const variables_map& vm ) const
 {
-    bool is_valid = ( vm.count( this->get_command_string() ) > 0 );
+    bool is_valid = ( vm.count( get_command_string() ) > 0 );
 
     return is_valid;
 }

diff --git a/src/config/option/hostportoption.cpp b/src/config/option/hostportoption.cpp
index 87c7894..349b4d4 100644 (file)
--- a/src/config/option/hostportoption.cpp
+++ b/src/config/option/hostportoption.cpp
@@ -52,7 +52,7 @@ HostPortOption::~HostPortOption()
 
 bool HostPortOption::validate( const variables_map& vm ) const
 {
-    bool is_valid = ( vm.count( this->get_command_string() ) > 0 );
+    bool is_valid = ( vm.count( get_command_string() ) > 0 );
 
     return is_valid;
 }