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/chrono | |
| 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/chrono')
| -rw-r--r-- | libcxx/include/chrono | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/chrono b/libcxx/include/chrono index e5b9a496b01..a6cd1945bff 100644 --- a/libcxx/include/chrono +++ b/libcxx/include/chrono @@ -407,7 +407,7 @@ public: (ratio_divide<_Period2, period>::type::den == 1 && !treat_as_floating_point<_Rep2>::value) >::type* = 0) - : __rep_(_STD::chrono::duration_cast<duration>(__d).count()) {} + : __rep_(_VSTD::chrono::duration_cast<duration>(__d).count()) {} // observer @@ -726,7 +726,7 @@ inline _LIBCPP_INLINE_VISIBILITY time_point<_Clock, _ToDuration> time_point_cast(const time_point<_Clock, _Duration>& __t) { - return time_point<_Clock, _ToDuration>(_STD::chrono::duration_cast<_ToDuration>(__t.time_since_epoch())); + return time_point<_Clock, _ToDuration>(_VSTD::chrono::duration_cast<_ToDuration>(__t.time_since_epoch())); } // time_point == |
