Fix build errors when ICMP pinger is enabled.

Inline YesNoNone constructor to allow using SquidConfig structure
without linking cache_cf.o.

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 5c87ba79c039b693f752a8252f28d6169ec1cc3e..7abfe0b79a5b220aa0a707aec7872e20f1429299 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3347,10 +3347,6 @@ dump_removalpolicy(StoreEntry * entry, const char *name, RemovalPolicySettings *
     storeAppendPrintf(entry, "\n");
 }
 
-YesNoNone::YesNoNone(): option(0)
-{
-}
-
 void
 YesNoNone::configure(bool beSet)
 {

diff --git a/src/structs.h b/src/structs.h
index e7bf51c91b7a272bdfed1bfb72fdbfdc4d7961ce..85e1a563a8b497e382eea1671253b6af4faabb16 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -152,7 +152,7 @@ class SwapDir;
 class YesNoNone {
 // TODO: generalize to non-boolean option types
 public:
-    YesNoNone();
+    YesNoNone(): option(0) {}
 
     /// returns true iff enabled; asserts if the option has not been configured
     operator void *() const; // TODO: use a fancy/safer version of the operator

diff --git a/src/tests/stub_cache_cf.cc b/src/tests/stub_cache_cf.cc
index 5407b32b91fbd83c7a0e0a11264f0372ec0c46a5..74b257ad97445ea9c22e38c303d0edd5cff4a7e5 100644 (file)
--- a/src/tests/stub_cache_cf.cc
+++ b/src/tests/stub_cache_cf.cc
@@ -115,11 +115,6 @@ dump_acl_access(StoreEntry * entry, const char *name, acl_access * head)
     fatal("not implemented 11");
 }
 
-YesNoNone::YesNoNone()
-{
-    /* ignore this for testing  */
-}
-
 YesNoNone::operator void*() const
 {
     /* ignore this for testing  */