Changeset 1556

Timestamp:

05/26/10 05:59:40 (15 years ago)

Author:

rsinfu

Message:

Removed ref return attribute from toDelegate().
It's indeed reasonable to make the parameter auto ref because fp can be a structure with opCall since r1528. But ref return is not necessary for toDelegate() itself.

Files:

• trunk/phobos/std/functional.d (modified) (1 diff)

trunk/phobos/std/functional.d

@@ -538 +538 @@
- * void runDelegate(void delegate() myDelegate) {
- *     myDelegate();
- * }
- *
- * auto delegateToPass = toDelegate(&doStuff);
- * runDelegate(delegateToPass);  // Calls doStuff, prints "Hello, world."
- * ---
- *
- * Bugs:  Doesn't work properly with ref return.  (See DMD bug 3756.)
- */
-ref 
+
-
-    static if (is(F == delegate))
-    {
-        return fp;
-    }
-    else static if (is(typeof(&F.opCall) == delegate)
-                || (is(typeof(&F.opCall) V : V*) && is(V == function)))
-    {
-        return toDelegate(&fp.opCall);
-    }