merged fusion from the trunk

[SVN r63560]
This commit is contained in:
Christopher Schmidt
2010-07-03 20:10:58 +00:00
parent 649770fdcd
commit 1572e0e9c3
402 changed files with 4874 additions and 5055 deletions

View File

@ -75,14 +75,14 @@ main()
{
// conversion from point to vector
point p(5, 3);
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p(5, 3);
list<int, short> l(p);
list<int, long> l(p);
l = p;
}