_STD -> _VSTD to avoid macro clash on windows
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/ios.cpp b/src/ios.cpp
index bca15fb..80917a0 100644
--- a/src/ios.cpp
+++ b/src/ios.cpp
@@ -165,7 +165,7 @@
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = _STD::max(2 * __iarray_cap_, req_size);
+ newcap = _VSTD::max(2 * __iarray_cap_, req_size);
else
newcap = mx;
long* iarray = (long*)realloc(__iarray_, newcap * sizeof(long));
@@ -193,7 +193,7 @@
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = _STD::max(2 * __parray_cap_, req_size);
+ newcap = _VSTD::max(2 * __parray_cap_, req_size);
else
newcap = mx;
void** parray = (void**)realloc(__parray_, newcap * sizeof(void*));
@@ -223,7 +223,7 @@
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = _STD::max(2 * __event_cap_, req_size);
+ newcap = _VSTD::max(2 * __event_cap_, req_size);
else
newcap = mx;
event_callback* fns = (event_callback*)realloc(__fn_, newcap * sizeof(event_callback));
@@ -403,24 +403,24 @@
void
ios_base::swap(ios_base& rhs)
{
- _STD::swap(__fmtflags_, rhs.__fmtflags_);
- _STD::swap(__precision_, rhs.__precision_);
- _STD::swap(__width_, rhs.__width_);
- _STD::swap(__rdstate_, rhs.__rdstate_);
- _STD::swap(__exceptions_, rhs.__exceptions_);
+ _VSTD::swap(__fmtflags_, rhs.__fmtflags_);
+ _VSTD::swap(__precision_, rhs.__precision_);
+ _VSTD::swap(__width_, rhs.__width_);
+ _VSTD::swap(__rdstate_, rhs.__rdstate_);
+ _VSTD::swap(__exceptions_, rhs.__exceptions_);
locale& lhs_loc = *(locale*)&__loc_;
locale& rhs_loc = *(locale*)&rhs.__loc_;
- _STD::swap(lhs_loc, rhs_loc);
- _STD::swap(__fn_, rhs.__fn_);
- _STD::swap(__index_, rhs.__index_);
- _STD::swap(__event_size_, rhs.__event_size_);
- _STD::swap(__event_cap_, rhs.__event_cap_);
- _STD::swap(__iarray_, rhs.__iarray_);
- _STD::swap(__iarray_size_, rhs.__iarray_size_);
- _STD::swap(__iarray_cap_, rhs.__iarray_cap_);
- _STD::swap(__parray_, rhs.__parray_);
- _STD::swap(__parray_size_, rhs.__parray_size_);
- _STD::swap(__parray_cap_, rhs.__parray_cap_);
+ _VSTD::swap(lhs_loc, rhs_loc);
+ _VSTD::swap(__fn_, rhs.__fn_);
+ _VSTD::swap(__index_, rhs.__index_);
+ _VSTD::swap(__event_size_, rhs.__event_size_);
+ _VSTD::swap(__event_cap_, rhs.__event_cap_);
+ _VSTD::swap(__iarray_, rhs.__iarray_);
+ _VSTD::swap(__iarray_size_, rhs.__iarray_size_);
+ _VSTD::swap(__iarray_cap_, rhs.__iarray_cap_);
+ _VSTD::swap(__parray_, rhs.__parray_);
+ _VSTD::swap(__parray_size_, rhs.__parray_size_);
+ _VSTD::swap(__parray_cap_, rhs.__parray_cap_);
}
void
diff --git a/src/iostream.cpp b/src/iostream.cpp
index b4b29c8..157c397 100644
--- a/src/iostream.cpp
+++ b/src/iostream.cpp
@@ -33,11 +33,11 @@
ios_base::Init::Init()
{
cin.tie(&cout);
- _STD::unitbuf(cerr);
+ _VSTD::unitbuf(cerr);
cerr.tie(&cout);
wcin.tie(&wcout);
- _STD::unitbuf(wcerr);
+ _VSTD::unitbuf(wcerr);
wcerr.tie(&wcout);
}
diff --git a/src/locale.cpp b/src/locale.cpp
index 8f44ab0..8e4f383 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -41,7 +41,7 @@
using ::localeconv_l;
using ::mbsrtowcs_l;
- decltype(MB_CUR_MAX_L(_STD::declval<locale_t>()))
+ decltype(MB_CUR_MAX_L(_VSTD::declval<locale_t>()))
inline _LIBCPP_INLINE_VISIBILITY
mb_cur_max_l(locale_t loc)
{
@@ -188,10 +188,10 @@
facets_(N)
{
facets_.clear();
- install(&make<_STD::collate<char> >(1));
- install(&make<_STD::collate<wchar_t> >(1));
- install(&make<_STD::ctype<char> >((ctype_base::mask*)0, false, 1));
- install(&make<_STD::ctype<wchar_t> >(1));
+ install(&make<_VSTD::collate<char> >(1));
+ install(&make<_VSTD::collate<wchar_t> >(1));
+ install(&make<_VSTD::ctype<char> >((ctype_base::mask*)0, false, 1));
+ install(&make<_VSTD::ctype<wchar_t> >(1));
install(&make<codecvt<char, char, mbstate_t> >(1));
install(&make<codecvt<wchar_t, char, mbstate_t> >(1));
install(&make<codecvt<char16_t, char, mbstate_t> >(1));
@@ -214,8 +214,8 @@
install(&make<time_get<wchar_t> >(1));
install(&make<time_put<char> >(1));
install(&make<time_put<wchar_t> >(1));
- install(&make<_STD::messages<char> >(1));
- install(&make<_STD::messages<wchar_t> >(1));
+ install(&make<_VSTD::messages<char> >(1));
+ install(&make<_VSTD::messages<wchar_t> >(1));
}
locale::__imp::__imp(const string& name, size_t refs)
@@ -358,17 +358,17 @@
#endif // _LIBCPP_NO_EXCEPTIONS
if (c & locale::collate)
{
- install_from<_STD::collate<char> >(one);
- install_from<_STD::collate<wchar_t> >(one);
+ install_from<_VSTD::collate<char> >(one);
+ install_from<_VSTD::collate<wchar_t> >(one);
}
if (c & locale::ctype)
{
- install_from<_STD::ctype<char> >(one);
- install_from<_STD::ctype<wchar_t> >(one);
- install_from<_STD::codecvt<char, char, mbstate_t> >(one);
- install_from<_STD::codecvt<char16_t, char, mbstate_t> >(one);
- install_from<_STD::codecvt<char32_t, char, mbstate_t> >(one);
- install_from<_STD::codecvt<wchar_t, char, mbstate_t> >(one);
+ install_from<_VSTD::ctype<char> >(one);
+ install_from<_VSTD::ctype<wchar_t> >(one);
+ install_from<_VSTD::codecvt<char, char, mbstate_t> >(one);
+ install_from<_VSTD::codecvt<char16_t, char, mbstate_t> >(one);
+ install_from<_VSTD::codecvt<char32_t, char, mbstate_t> >(one);
+ install_from<_VSTD::codecvt<wchar_t, char, mbstate_t> >(one);
}
if (c & locale::monetary)
{
@@ -399,8 +399,8 @@
}
if (c & locale::messages)
{
- install_from<_STD::messages<char> >(one);
- install_from<_STD::messages<wchar_t> >(one);
+ install_from<_VSTD::messages<char> >(one);
+ install_from<_VSTD::messages<wchar_t> >(one);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
diff --git a/src/regex.cpp b/src/regex.cpp
index a29ed73..65e9f88 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -229,7 +229,7 @@
__get_collation_name(const char* s)
{
const collationnames* i =
- _STD::lower_bound(begin(collatenames), end(collatenames), s, use_strcmp());
+ _VSTD::lower_bound(begin(collatenames), end(collatenames), s, use_strcmp());
string r;
if (i != end(collatenames) && strcmp(s, i->elem_) == 0)
r = char(i->char_);
@@ -240,7 +240,7 @@
__get_classname(const char* s, bool __icase)
{
const classnames* i =
- _STD::lower_bound(begin(ClassNames), end(ClassNames), s, use_strcmp());
+ _VSTD::lower_bound(begin(ClassNames), end(ClassNames), s, use_strcmp());
ctype_base::mask r = 0;
if (i != end(ClassNames) && strcmp(s, i->elem_) == 0)
{
diff --git a/src/strstream.cpp b/src/strstream.cpp
index ef12f98..c2b7f42 100644
--- a/src/strstream.cpp
+++ b/src/strstream.cpp
@@ -150,10 +150,10 @@
strstreambuf::swap(strstreambuf& __rhs)
{
streambuf::swap(__rhs);
- _STD::swap(__strmode_, __rhs.__strmode_);
- _STD::swap(__alsize_, __rhs.__alsize_);
- _STD::swap(__palloc_, __rhs.__palloc_);
- _STD::swap(__pfree_, __rhs.__pfree_);
+ _VSTD::swap(__strmode_, __rhs.__strmode_);
+ _VSTD::swap(__alsize_, __rhs.__alsize_);
+ _VSTD::swap(__palloc_, __rhs.__palloc_);
+ _VSTD::swap(__pfree_, __rhs.__pfree_);
}
void
@@ -302,7 +302,7 @@
{
char* newpos = eback() + newoff;
if (pos_in)
- setg(eback(), newpos, _STD::max(newpos, egptr()));
+ setg(eback(), newpos, _VSTD::max(newpos, egptr()));
if (pos_out)
{
// min(pbase, newpos), newpos, epptr()
@@ -332,7 +332,7 @@
{
char* newpos = eback() + newoff;
if (pos_in)
- setg(eback(), newpos, _STD::max(newpos, egptr()));
+ setg(eback(), newpos, _VSTD::max(newpos, egptr()));
if (pos_out)
{
// min(pbase, newpos), newpos, epptr()
diff --git a/src/system_error.cpp b/src/system_error.cpp
index caafc32..763d62c 100644
--- a/src/system_error.cpp
+++ b/src/system_error.cpp
@@ -147,7 +147,7 @@
what_arg += ": ";
what_arg += ec.message();
}
- return _STD::move(what_arg);
+ return _VSTD::move(what_arg);
}
system_error::system_error(error_code ec, const string& what_arg)