summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-06-01 11:23:15 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-06-01 11:23:15 (GMT)
commite9e2d96cf1a3a47f98f63bff0f1b2570a2e5b71d (patch)
treee08c1bcdbc61b667cda50e9af8fb3bf39b8f96d3 /library
parenta88091c1bf14f254449273a9f864d8f09009fe67 (diff)
downloadtcl-no_smartref.zip
tcl-no_smartref.tar.gz
tcl-no_smartref.tar.bz2
Attempt to get new clock code working without the need for smartref.no_smartref
Diffstat (limited to 'library')
-rw-r--r--library/clock.tcl11
1 files changed, 4 insertions, 7 deletions
diff --git a/library/clock.tcl b/library/clock.tcl
index 471deff..1222084 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -544,8 +544,7 @@ proc mcget {loc} {
# try to retrieve now if already available:
if {[dict exists $mcMergedCat $loc]} {
- set mrgcat [dict get $mcMergedCat $loc]
- return [dict smartref $mrgcat]
+ return [dict get $mcMergedCat $loc]
}
# get locales list for given locale (de_de -> {de_de de {}})
@@ -576,13 +575,12 @@ proc mcget {loc} {
# locales List of locales to merge.
#
# Results:
-# Returns the (weak pointer) to merged dictionary of message catalog.
+# Returns the merged dictionary of message catalog.
#
proc mcMerge {locales} {
variable mcMergedCat
if {[dict exists $mcMergedCat [set loc [lindex $locales 0]]]} {
- set mrgcat [dict get $mcMergedCat $loc]
- return [dict smartref $mrgcat]
+ return [dict get $mcMergedCat $loc]
}
# package msgcat currently does not provide possibility to get whole catalog:
upvar ::msgcat::Msgs Msgs
@@ -601,8 +599,7 @@ proc mcMerge {locales} {
}
}
dict set mcMergedCat $loc $mrgcat
- # return smart reference (shared dict as object with exact one ref-counter)
- return [dict smartref $mrgcat]
+ return $mrgcat
}
#----------------------------------------------------------------------