From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 20 Feb 2009 18:48:56 +0000 (-0700)
Subject: Added CBDATA_NAMESPACED_CLASS_INIT to define static members of classes that
X-Git-Tag: SQUID_3_2_0_1~1157^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99f1f9965ae3d31257d8a3407d7fd03b1e6b65bc;p=thirdparty%2Fsquid.git

Added CBDATA_NAMESPACED_CLASS_INIT to define static members of classes that
live in a namespace.

The alternative was to change CBDATA_CLASS_* macros so that the static member
name does not depend on the type. That may have been better, but perhaps there
are some, unknown to me, low-level reasons why unique member names are
required for class cbdata code to work.
---

diff --git a/src/cbdata.h b/src/cbdata.h
index 80cfc53bb5..1ae6492d54 100644
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -378,6 +378,7 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in
 
 /// \ingroup CBDATAAPI
 #define CBDATA_CLASS_INIT(type) cbdata_type type::CBDATA_##type = CBDATA_UNKNOWN
+#define CBDATA_NAMESPACED_CLASS_INIT(namespace, type) cbdata_type namespace::type::CBDATA_##type = CBDATA_UNKNOWN
 
 /**
  \ingroup CBDATAAPI