Merge pull request #4763 from tmccombs/unique-cleanup

andralex · web-flow · commit ace0b9378811 · 2016-10-01T00:48:12.000-04:00
Unique cleanup
diff --git a/std/typecons.d b/std/typecons.d
@@ -146,7 +146,7 @@ public:
     ~this()
     {
         debug(Unique) writeln("Unique destructor of ", (_p is null)? null: _p);
-        if (_p !is null) delete _p;
+        if (_p !is null) destroy(_p);
         _p = null;
     }
     /** Returns whether the resource exists. */
@@ -163,8 +163,9 @@ public:
         debug(Unique) writeln("return from Release");
         return u;
     }
+
     /** Forwards member access to contents. */
-    auto opDot() inout { return _p; }
+    mixin Proxy!_p;
 
     /**
     Postblit operator is undefined to prevent the cloning of $(D Unique) objects.

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public:`
`146`	`146`	`~this()`
`147`	`147`	`{`
`148`	`148`	`debug(Unique) writeln("Unique destructor of ", (_p is null)? null: _p);`
`149`		`- if (_p !is null) delete _p;`
	`149`	`+ if (_p !is null) destroy(_p);`
`150`	`150`	`_p = null;`
`151`	`151`	`}`
`152`	`152`	`/** Returns whether the resource exists. */`
`@@ -163,8 +163,9 @@ public:`
`163`	`163`	`debug(Unique) writeln("return from Release");`
`164`	`164`	`return u;`
`165`	`165`	`}`
	`166`	`+`
`166`	`167`	`/** Forwards member access to contents. */`
`167`		`- auto opDot() inout { return _p; }`
	`168`	`+ mixin Proxy!_p;`
`168`	`169`
`169`	`170`	`/**`
`170`	`171`	`Postblit operator is undefined to prevent the cloning of $(D Unique) objects.`