diff options
author | Andy Wingo <wingo@pobox.com> | 2014-02-08 14:46:31 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2014-02-08 14:46:31 +0100 |
commit | 04023cceb7584810005906b86c876d703a0e98b5 (patch) | |
tree | 3edbe0258ecde21b98707123150100cb881cea85 | |
parent | d4a5776ac5fd39fc65100d626ca3c147ca3dc2c2 (diff) | |
parent | b86069c1308a6ca36f3a3bc56134b3f8fd693592 (diff) | |
download | guile-04023cceb7584810005906b86c876d703a0e98b5.tar.gz |
Merge commit 'b86069c1308a6ca36f3a3bc56134b3f8fd693592'
Conflicts:
libguile/hashtab.c
-rw-r--r-- | doc/ref/api-memory.texi | 6 | ||||
-rw-r--r-- | libguile/weak-table.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ref/api-memory.texi b/doc/ref/api-memory.texi index ec6c705e4..01bfe81b2 100644 --- a/doc/ref/api-memory.texi +++ b/doc/ref/api-memory.texi @@ -296,9 +296,9 @@ they constitute a doubly-weak table has to be used. @node Weak hash tables @subsubsection Weak hash tables -@deffn {Scheme Procedure} make-weak-key-hash-table size -@deffnx {Scheme Procedure} make-weak-value-hash-table size -@deffnx {Scheme Procedure} make-doubly-weak-hash-table size +@deffn {Scheme Procedure} make-weak-key-hash-table [size] +@deffnx {Scheme Procedure} make-weak-value-hash-table [size] +@deffnx {Scheme Procedure} make-doubly-weak-hash-table [size] @deffnx {C Function} scm_make_weak_key_hash_table (size) @deffnx {C Function} scm_make_weak_value_hash_table (size) @deffnx {C Function} scm_make_doubly_weak_hash_table (size) diff --git a/libguile/weak-table.c b/libguile/weak-table.c index e91106988..4e3ed3396 100644 --- a/libguile/weak-table.c +++ b/libguile/weak-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc. +/* Copyright (C) 2011, 2012, 2013, 2014 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -1079,7 +1079,7 @@ SCM_DEFINE (scm_make_weak_value_hash_table, "make-weak-value-hash-table", 0, 1, #undef FUNC_NAME -SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 1, 0, 0, +SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 0, 1, 0, (SCM n), "Return a hash table with weak keys and values with @var{size}\n" "buckets. (@pxref{Hash Tables})") |