[2268] Move LoadCallback typedef to an internal namespace

src/lib/datasrc/memory/memory_client.cc

@@ -65,7 +65,8 @@ public:
 result::Result
 InMemoryClient::load(const Name& zone_name,
                      const string& filename,
-                     boost::function<void(LoadCallback)> rrset_installer)
+                     boost::function<void(internal::LoadCallback)>
+                         rrset_installer)
 {
     SegmentObjectHolder<ZoneData, RRClass> holder(
         mem_sgmt_, ZoneData::create(mem_sgmt_, zone_name), rrclass_);
@@ -143,7 +144,7 @@ namespace {
 void
 masterLoadWrapper(const char* const filename, const Name& origin,
                   const RRClass& zone_class,
-                  InMemoryClient::LoadCallback callback)
+                  internal::LoadCallback callback)
 {
     masterLoad(filename, origin, zone_class, boost::bind(callback, _1));
 }
@@ -151,7 +152,7 @@ masterLoadWrapper(const char* const filename, const Name& origin,
 // The installer called from load() for the iterator version of load().
 void
 generateRRsetFromIterator(ZoneIterator* iterator,
-                          InMemoryClient::LoadCallback callback)
+                          internal::LoadCallback callback)
 {
     ConstRRsetPtr rrset;
     while ((rrset = iterator->getNextRRset()) != NULL) {

src/lib/datasrc/memory/memory_client.h

@@ -36,6 +36,14 @@ class RRsetList;
 namespace datasrc {
 namespace memory {
 
+namespace internal {
+    // Please don't use anything from here outside the InMemoryClient
+    // implementation.
+
+    // A functor type used for loading.
+    typedef boost::function<void(isc::dns::ConstRRsetPtr)> LoadCallback;
+} // end of internal namespace
+
 /// \brief A data source client that holds all necessary data in memory.
 ///
 /// The \c InMemoryClient class provides an access to a conceptual data
@@ -206,9 +214,6 @@ public:
     getJournalReader(const isc::dns::Name& zone, uint32_t begin_serial,
                      uint32_t end_serial) const;
 
-    // A functor type used for loading.
-    typedef boost::function<void(isc::dns::ConstRRsetPtr)> LoadCallback;
-
 private:
     // Some type aliases
     typedef DomainTree<std::string> FileNameTree;
@@ -224,7 +229,8 @@ private:
     // loaded from another data source.
     result::Result load(const isc::dns::Name& zone_name,
                         const std::string& filename,
-                        boost::function<void(LoadCallback)> rrset_installer);
+                        boost::function<void(internal::LoadCallback)>
+                            rrset_installer);
 
     util::MemorySegment& mem_sgmt_;
     const isc::dns::RRClass rrclass_;