diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
| commit | ce48a1137d56d368828d360e5f2a8162bac6517c (patch) | |
| tree | ec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/ios | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
| download | bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/ios')
| -rw-r--r-- | libcxx/include/ios | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/ios b/libcxx/include/ios index b0e7ab96346..e2f2b6fd4d5 100644 --- a/libcxx/include/ios +++ b/libcxx/include/ios @@ -266,8 +266,8 @@ public: enum seekdir {beg, cur, end}; typedef seekdir seek_dir; - typedef _STD::streamoff streamoff; - typedef _STD::streampos streampos; + typedef _VSTD::streamoff streamoff; + typedef _VSTD::streampos streampos; class Init; @@ -776,8 +776,8 @@ void basic_ios<_CharT, _Traits>::swap(basic_ios& __rhs) { ios_base::swap(__rhs); - _STD::swap(__tie_, __rhs.__tie_); - _STD::swap(__fill_, __rhs.__fill_); + _VSTD::swap(__tie_, __rhs.__tie_); + _VSTD::swap(__fill_, __rhs.__fill_); } template <class _CharT, class _Traits> |
