[1207] minor cleanups after review

- fixed a few include statements
- amended a few comments

src/bin/auth/auth_srv.cc

@@ -410,8 +410,7 @@ AuthSrv::getInMemoryClient(const RRClass& rrclass) {
 
 bool
 AuthSrv::hasInMemoryClient() const {
-    return (impl_->memory_client_container_ !=
-            isc::datasrc::DataSourceClientContainerPtr());
+    return (impl_->memory_client_container_);
 }
 
 void

src/bin/auth/auth_srv.h

@@ -257,9 +257,9 @@ public:
     /// Returns the DataSourceClientContainer of the in-memory datasource
     ///
     /// \exception InvalidParameter if the given class does not match
-    ///            the one in the memory data source
-    /// \exception InvalidOperation if the memory datasource has not been set
-    ///            (callers can check with \c hasMemoryDataSource())
+    ///            the one in the memory data source, or if the memory
+    ///            datasource has not been set (callers can check with
+    ///            \c hasMemoryDataSource())
     ///
     /// \param rrclass The RR class of the requested in-memory data source.
     /// \return A shared pointer to the in-memory data source, if configured;

src/lib/datasrc/factory.cc

@@ -24,7 +24,6 @@
 #include <datasrc/logger.h>
 
 #include <exceptions/exceptions.h>
-#include <dns/masterload.h>
 
 #include <dlfcn.h>
 #include <cstdlib>

src/lib/datasrc/factory.h

@@ -17,7 +17,6 @@
 
 #include <datasrc/data_source.h>
 #include <datasrc/client.h>
-#include <exceptions/exceptions.h>
 
 #include <cc/data.h>
 
@@ -135,6 +134,13 @@ private:
 ///
 /// extern "C" void destroyInstance(isc::data::DataSourceClient* instance);
 /// \endcode
+///
+/// \note This class is relatively recent, and its design is not yet fully
+/// formed. We may want to split this into an abstract base container
+/// class, and a derived 'dyload' class, and perhaps then add non-dynamic
+/// derived classes as well. Currently, the class is actually derived in some
+/// of the tests, which is rather unclean (as this class as written is really
+/// intended to be used directly).
 class DataSourceClientContainer : boost::noncopyable {
 public:
     /// \brief Constructor