Merge to upstream r226192.
Change-Id: Id459c8ce0d7dec371ff4d064ee2c71f6b7178e63
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
// assign(basic_string<charT,traits>&& str);
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
// operator+(charT lhs, basic_string<charT,traits,Allocator>&& rhs);
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
// operator+(const charT* lhs, basic_string<charT,traits,Allocator>&& rhs);
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
// operator+(basic_string<charT,traits,Allocator>&& lhs, charT rhs);
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
// operator+(basic_string<charT,traits,Allocator>&& lhs, const charT* rhs);
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
// const basic_string<charT,traits,Allocator>&& rhs);
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
Reference in New Issue
Block a user