From: Amos Jeffries Date: Sun, 5 Oct 2014 09:59:47 +0000 (-0700) Subject: Remove C++11'ism in rev.13604 X-Git-Tag: SQUID_3_5_0_1~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aca988c41dca74457884890950046cda1cf83a41;p=thirdparty%2Fsquid.git Remove C++11'ism in rev.13604 We are not quite going to require C++11 yet. Revert Helper::ChildConfig default constructor to C++03 syntax. --- diff --git a/src/helper/ChildConfig.cc b/src/helper/ChildConfig.cc index c929aabd0c..0d84a99f47 100644 --- a/src/helper/ChildConfig.cc +++ b/src/helper/ChildConfig.cc @@ -16,6 +16,15 @@ #include +Helper::ChildConfig::ChildConfig(): + n_max(0), + n_startup(0), + n_idle(1), + concurrency(0), + n_running(0), + n_active(0) +{} + Helper::ChildConfig::ChildConfig(const unsigned int m): n_max(m), n_startup(0), diff --git a/src/helper/ChildConfig.h b/src/helper/ChildConfig.h index ecdff316d5..ed09989ef6 100644 --- a/src/helper/ChildConfig.h +++ b/src/helper/ChildConfig.h @@ -21,7 +21,7 @@ namespace Helper class ChildConfig { public: - ChildConfig() : ChildConfig(0) {} + ChildConfig(); explicit ChildConfig(const unsigned int m); /** diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc index 2d9e80854c..2b2ea18112 100644 --- a/src/tests/stub_HelperChildConfig.cc +++ b/src/tests/stub_HelperChildConfig.cc @@ -15,6 +15,15 @@ #include +Helper::ChildConfig::ChildConfig(): + n_max(0), + n_startup(0), + n_idle(1), + concurrency(0), + n_running(0), + n_active(0) +{} + Helper::ChildConfig::ChildConfig(const unsigned int m): n_max(m), n_startup(0),