Merge branch 'master' into SQUID-1041-mgr-forward-workaround

src/debug/Stream.h

@@ -208,23 +208,8 @@ void ResyncDebugLog(FILE *newDestination);
 /// Outside of debugs() context, has no effect and should not be used.
 std::ostream& ForceAlert(std::ostream& s);
 
-/** stream manipulator which does nothing.
- * \deprecated Do not add to new code, and remove when editing old code
- *
- * Its purpose is to inactivate calls made following previous debugs()
- * guidelines such as
- * debugs(1,2, "some message");
- *
- * His former objective is now absorbed in the debugs call itself
- */
-inline std::ostream&
-HERE(std::ostream& s)
-{
-    return s;
-}
-
 /*
- * MYNAME is for use at debug levels 0 and 1 where HERE is too messy.
+ * MYNAME is for use (in rare/special cases) at debug levels 0 and 1
  *
  * debugs(1,1, MYNAME << "WARNING: some message");
  */

src/tests/stub_cache_manager.cc

@@ -15,11 +15,7 @@
 #include "tests/STUB.h"
 
 Mgr::Action::Pointer CacheManager::createNamedAction(char const*) STUB_RETVAL(nullptr)
-void CacheManager::start(const Comm::ConnectionPointer &, HttpRequest *, StoreEntry *, const AccessLogEntryPointer &)
-{
-    std::cerr << HERE << "\n";
-    STUB
-}
+void CacheManager::start(const Comm::ConnectionPointer &, HttpRequest *, StoreEntry *, const AccessLogEntryPointer &) STUB
 static CacheManager* instance = nullptr;
 CacheManager* CacheManager::GetInstance() STUB_RETVAL(instance)
 void Mgr::RegisterAction(char const *, char const *, OBJH *, Protected, Atomic, Format) {}