From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 31 Oct 2013 04:39:36 +0000 (+0100)
Subject: Remove auth/User.cci, moving contents to .h and .cc files
X-Git-Tag: SQUID_3_5_0_1~572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3211357686fbd7315140fda755c9aa8d3dea277b;p=thirdparty%2Fsquid.git

Remove auth/User.cci, moving contents to .h and .cc files
---

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 2423048bf2..58a0e50aa5 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -24,7 +24,6 @@ libauth_la_SOURCES = \
 	State.h \
 	State.cc \
 	User.h \
-	User.cci \
 	User.cc \
 	UserRequest.h \
 	UserRequest.cc
diff --git a/src/auth/User.cc b/src/auth/User.cc
index 782196c7b7..d0938dd576 100644
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -44,10 +44,6 @@
 #include "SquidTime.h"
 #include "Store.h"
 
-#if !_USE_INLINE_
-#include "auth/User.cci"
-#endif
-
 // This should be converted into a pooled type. Does not need to be cbdata
 CBDATA_TYPE(AuthUserIP);
 
@@ -387,3 +383,14 @@ Auth::User::UsernameCacheStats(StoreEntry *output)
                          );
     }
 }
+
+void
+Auth::User::username(char const *aString)
+{
+    if (aString) {
+        assert(!username_);
+        username_ = xstrdup(aString);
+    } else {
+        safe_free(username_);
+    }
+}
diff --git a/src/auth/User.cci b/src/auth/User.cci
deleted file mode 100644
index 758c460c11..0000000000
--- a/src/auth/User.cci
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * DEBUG: section 29    Authenticator
- * AUTHOR:  Robert Collins
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
- */
-
-char const *
-Auth::User::username () const
-{
-    return username_;
-}
-
-void
-Auth::User::username(char const *aString)
-{
-    if (aString) {
-        assert(!username_);
-        username_ = xstrdup(aString);
-    } else {
-        safe_free(username_);
-    }
-}
diff --git a/src/auth/User.h b/src/auth/User.h
index 4e680c37c1..c6c9b1f19f 100644
--- a/src/auth/User.h
+++ b/src/auth/User.h
@@ -85,8 +85,8 @@ public:
 
     void absorb(Auth::User::Pointer from);
     virtual ~User();
-    _SQUID_INLINE_ char const *username() const;
-    _SQUID_INLINE_ void username(char const *);
+    char const *username() const { return username_; }
+    void username(char const *);
 
     /**
      * How long these credentials are still valid for.
@@ -139,9 +139,5 @@ private:
 
 } // namespace Auth
 
-#if _USE_INLINE_
-#include "auth/User.cci"
-#endif
-
 #endif /* USE_AUTH */
 #endif /* SQUID_AUTH_USER_H */