------------------------------------------------------------
revno: 13073
revision-id: kinkie@squid-cache.org-20131031043936-a8ltc38kf1tv31n6
parent: squid3@treenet.co.nz-20131030061730-e13nfkuy2tslmwqg
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Thu 2013-10-31 05:39:36 +0100
message:
  Remove auth/User.cci, moving contents to .h and .cc files
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20131031043936-a8ltc38kf1tv31n6
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 7fc5e0da390f501d519989bb4ea9830f14f7c20e
# timestamp: 2013-10-31 04:56:21 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20131030061730-\
#   e13nfkuy2tslmwqg
# 
# Begin patch
=== modified file 'src/auth/Makefile.am'
--- src/auth/Makefile.am	2013-02-22 13:26:12 +0000
+++ src/auth/Makefile.am	2013-10-31 04:39:36 +0000
@@ -24,7 +24,6 @@
 	State.h \
 	State.cc \
 	User.h \
-	User.cci \
 	User.cc \
 	UserRequest.h \
 	UserRequest.cc

=== modified file 'src/auth/User.cc'
--- src/auth/User.cc	2013-10-27 05:08:49 +0000
+++ src/auth/User.cc	2013-10-31 04:39:36 +0000
@@ -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 @@
                          );
     }
 }
+
+void
+Auth::User::username(char const *aString)
+{
+    if (aString) {
+        assert(!username_);
+        username_ = xstrdup(aString);
+    } else {
+        safe_free(username_);
+    }
+}

=== removed file 'src/auth/User.cci'
--- src/auth/User.cci	2012-09-01 14:38:36 +0000
+++ src/auth/User.cci	1970-01-01 00:00:00 +0000
@@ -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_);
-    }
-}

=== modified file 'src/auth/User.h'
--- src/auth/User.h	2013-10-27 05:08:49 +0000
+++ src/auth/User.h	2013-10-31 04:39:36 +0000
@@ -85,8 +85,8 @@
 
     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 @@
 
 } // namespace Auth
 
-#if _USE_INLINE_
-#include "auth/User.cci"
-#endif
-
 #endif /* USE_AUTH */
 #endif /* SQUID_AUTH_USER_H */