Merged container from trunk

[SVN r81663]
This commit is contained in:
Ion Gaztañaga
2012-12-01 23:01:47 +00:00
parent 7cbe13a647
commit 6c9288aba5
48 changed files with 2870 additions and 2214 deletions

View File

@@ -330,9 +330,6 @@ int string_test()
//Check addition
{
typedef std::basic_string<CharType> StdString;
typedef basic_string<CharType> BoostString;
BoostString bs2 = string_literals<CharType>::String();
StdString ss2 = string_literals<CharType>::String();
BoostString bs3 = string_literals<CharType>::Suffix();