------------------------------------------------------------ revno: 13627 revision-id: squid3@treenet.co.nz-20141005095947-w5fn5onmeuhewm4x parent: squid3@treenet.co.nz-20141004092701-n6cia05g0awgnpwb committer: Amos Jeffries branch nick: trunk timestamp: Sun 2014-10-05 02:59:47 -0700 message: 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. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141005095947-w5fn5onmeuhewm4x # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: d0b201a50f4880c6a3efecf64efa40923688aead # timestamp: 2014-10-06 17:35:22 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk # base_revision_id: squid3@treenet.co.nz-20141004092701-\ # n6cia05g0awgnpwb # # Begin patch === modified file 'src/helper/ChildConfig.cc' --- src/helper/ChildConfig.cc 2014-09-25 06:50:32 +0000 +++ src/helper/ChildConfig.cc 2014-10-05 09:59:47 +0000 @@ -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), === modified file 'src/helper/ChildConfig.h' --- src/helper/ChildConfig.h 2014-10-04 09:27:01 +0000 +++ src/helper/ChildConfig.h 2014-10-05 09:59:47 +0000 @@ -21,7 +21,7 @@ class ChildConfig { public: - ChildConfig() : ChildConfig(0) {} + ChildConfig(); explicit ChildConfig(const unsigned int m); /** === modified file 'src/tests/stub_HelperChildConfig.cc' --- src/tests/stub_HelperChildConfig.cc 2014-09-25 06:50:32 +0000 +++ src/tests/stub_HelperChildConfig.cc 2014-10-05 09:59:47 +0000 @@ -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),