Improve class declaration consistency a bit. No functionality changes.

diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h
index 8a7c44d4bc02cc1539ff27fd580d7189686be5bf..330d5b7ec662dacb3b033ee68780161d0b983d9e 100644 (file)
--- a/src/auth/CredentialsCache.h
+++ b/src/auth/CredentialsCache.h
@@ -20,12 +20,8 @@ namespace Auth {
 /// Cache of Auth::User credentials, keyed by Auth::User::userKey
 class CredentialsCache
 {
-private:
     CBDATA_CLASS(CredentialsCache);
 
-    /// key is User::userKey(), mapped value is User::Pointer
-    typedef std::unordered_map<SBuf, Auth::User::Pointer> StoreType;
-
 public:
     explicit CredentialsCache(const char *name, const char * const eventName);
 
@@ -70,6 +66,8 @@ private:
     /// whether a cleanup (garbage collection) event has been scheduled
     bool gcScheduled_;
 
+    /// key is User::userKey(), mapped value is User::Pointer
+    typedef std::unordered_map<SBuf, Auth::User::Pointer> StoreType;
     StoreType store_;
 
     // c-string raw pointer used as event name

diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index 021831de3d1fbbc1817e597d314cbcb86d2b63fd..5a67b048d4ea752236d97b91d4761187e0825c9a 100644 (file)
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -26,10 +26,6 @@ class ConnOpener : public AsyncJob
 {
     CBDATA_CLASS(ConnOpener);
 
-protected:
-    virtual void start();
-    virtual void swanSong();
-
 public:
     void noteAbort() { mustStop("externally aborted"); }
 
@@ -43,6 +39,10 @@ public:
     void setHost(const char *);    ///< set the hostname note for this connection
     const char * getHost() const;  ///< get the hostname noted for this connection
 
+protected:
+    virtual void start();
+    virtual void swanSong();
+
 private:
     // Undefined because two openers cannot share a connection
     ConnOpener(const ConnOpener &);