big merge from trunk

[SVN r85668]
This commit is contained in:
Joel de Guzman
2013-09-15 06:16:39 +00:00
parent 1f718e4520
commit 8aef19648b
3 changed files with 272 additions and 1 deletions

View File

@ -492,7 +492,7 @@ Deferences the data property associated with the element referenced by an associ
template<
typename I
>
typename __result_of_deref_data__<I>::type deref(I const& i);
typename __result_of_deref_data__<I>::type deref_data(I const& i);
[table Parameters
[[Parameter] [Requirement] [Description]]