From 5a59faa4bf2b9fe5605dac79fb449a3dcb8b218f Mon Sep 17 00:00:00 2001 From: Dmitry Kurochkin Date: Mon, 22 Aug 2011 22:30:31 +0400 Subject: [PATCH] Fix build errors when ICMP pinger is enabled. Inline YesNoNone constructor to allow using SquidConfig structure without linking cache_cf.o. --- src/cache_cf.cc | 4 ---- src/structs.h | 2 +- src/tests/stub_cache_cf.cc | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 5c87ba79c0..7abfe0b79a 100644 --- 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 e7bf51c91b..85e1a563a8 100644 --- 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 5407b32b91..74b257ad97 100644 --- 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 */ -- 2.47.2