Cleanup: Simplify MEMPROXY_CLASS_* macros

[thirdparty/squid.git] / src / mime.cc

diff --git a/src/mime.cc b/src/mime.cc
index 07936205e463602b155b4fca3c8420d28ef4db6d..e39e3dbb1317b73af102ef7b05f5c156e43f7fba 100644 (file)
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -37,6 +37,8 @@ static char const *mimeGetIcon(const char *fn);
 
 class MimeIcon : public StoreClient
 {
+    MEMPROXY_CLASS(MimeIcon);
+
 public:
     explicit MimeIcon(const char *aName);
     ~MimeIcon();
@@ -44,16 +46,16 @@ public:
     char const * getName() const;
     void load();
     void created(StoreEntry *newEntry);
-    MEMPROXY_CLASS(MimeIcon);
 
 private:
     const char *icon_;
     char *url_;
 };
-MEMPROXY_CLASS_INLINE(MimeIcon);
 
 class MimeEntry
 {
+    MEMPROXY_CLASS(MimeEntry);
+
 public:
     explicit MimeEntry(const char *aPattern, const regex_t &compiledPattern,
                        const char *aContentType,
@@ -61,7 +63,6 @@ public:
                        bool optionViewEnable, bool optionDownloadEnable,
                        const char *anIconName);
     ~MimeEntry();
-    MEMPROXY_CLASS(MimeEntry);
 
     const char *pattern;
     regex_t compiled_pattern;
@@ -73,7 +74,6 @@ public:
     MimeIcon theIcon;
     MimeEntry *next;
 };
-MEMPROXY_CLASS_INLINE(MimeEntry);
 
 static MimeEntry *MimeTable = NULL;
 static MimeEntry **MimeTableTail = &MimeTable;