gstein 01/11/09 09:50:48
Modified: include apr_hash.h apr_pools.h
Log:
Constify the pool accessor functions. Use the DECLARE_ACCESSOR macro
for the apr_hash_t, rather than writing it out explicitly (and
incorrectly).
Revision Changes Path
1.31 +2 -1 apr/include/apr_hash.h
Index: apr_hash.h
===================================================================
RCS file: /home/cvs/apr/include/apr_hash.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- apr_hash.h 2001/08/24 17:55:45 1.30
+++ apr_hash.h 2001/11/09 17:50:48 1.31
@@ -198,7 +198,8 @@
* was created in
* @param hash the hash table in question
*/
-APR_DECLARE(apr_pool_t *) apr_hash_pool_get(apr_hash_t *hash);
+APR_POOL_DECLARE_ACCESSOR(hash);
+
/** @} */
#ifdef __cplusplus
}
1.63 +2 -2 apr/include/apr_pools.h
Index: apr_pools.h
===================================================================
RCS file: /home/cvs/apr/include/apr_pools.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- apr_pools.h 2001/10/29 14:54:18 1.62
+++ apr_pools.h 2001/11/09 17:50:48 1.63
@@ -446,13 +446,13 @@
*/
#define APR_POOL_DECLARE_ACCESSOR(typename) \
APR_DECLARE(apr_pool_t *) apr_##typename##_pool_get \
- (apr_##typename##_t *ob)
+ (const apr_##typename##_t *ob)
#define APR_POOL_IMPLEMENT_ACCESSOR(typename) \
APR_POOL_IMPLEMENT_ACCESSOR_X(typename, pool)
#define APR_POOL_IMPLEMENT_ACCESSOR_X(typename, fieldname) \
APR_DECLARE(apr_pool_t *) apr_##typename##_pool_get \
- (apr_##typename##_t *ob) { return ob->fieldname; }
+ (const apr_##typename##_t *ob) { return ob->fieldname; }
/* used to guarantee to the apr_pool_t debugging code that the sub apr_pool_t
* will not be destroyed before the parent pool */
