Put the borland workarounds back - it still seems to need them. Will probably

have to do something else on top of this for any problems this causes.


[SVN r37803]

libs/functional

@@ -1 +1 @@
-Subproject commit 5533eb6acff10d2cbcb38cd7b3174364abcebfad
+Subproject commit 26cfba5031b1aa21dc2810a7a59915b1f969665f