summaryrefslogtreecommitdiffstats
path: root/libcxx/include/complex
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-06-30 21:18:19 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-06-30 21:18:19 +0000
commitce48a1137d56d368828d360e5f2a8162bac6517c (patch)
treeec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/complex
parent070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff)
downloadbcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz
bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/complex')
-rw-r--r--libcxx/include/complex6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/complex b/libcxx/include/complex
index 273a807583b..f91b240488b 100644
--- a/libcxx/include/complex
+++ b/libcxx/include/complex
@@ -1173,7 +1173,7 @@ complex<typename __promote<_Tp, _Up>::type>
pow(const complex<_Tp>& __x, const complex<_Up>& __y)
{
typedef complex<typename __promote<_Tp, _Up>::type> result_type;
- return _STD::pow(result_type(__x), result_type(__y));
+ return _VSTD::pow(result_type(__x), result_type(__y));
}
template<class _Tp, class _Up>
@@ -1186,7 +1186,7 @@ typename enable_if
pow(const complex<_Tp>& __x, const _Up& __y)
{
typedef complex<typename __promote<_Tp, _Up>::type> result_type;
- return _STD::pow(result_type(__x), result_type(__y));
+ return _VSTD::pow(result_type(__x), result_type(__y));
}
template<class _Tp, class _Up>
@@ -1199,7 +1199,7 @@ typename enable_if
pow(const _Tp& __x, const complex<_Up>& __y)
{
typedef complex<typename __promote<_Tp, _Up>::type> result_type;
- return _STD::pow(result_type(__x), result_type(__y));
+ return _VSTD::pow(result_type(__x), result_type(__y));
}
// asinh
OpenPOWER on IntegriCloud