diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-03-08 10:59:54 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-03-08 10:59:54 -0500 |
| commit | 3200ebc2ea5f6bb51130cbc69d6533144a9f4ddc (patch) | |
| tree | e234c061c28a95c35afbb35b80b89e3114ecdeb9 /c_headers/cuda_wrappers/algorithm | |
| parent | 2e010c60ae006944ae20ab8b3445598471c9f1e8 (diff) | |
| parent | b57cb04afc1898c3b21ef3486709f0c0aa285433 (diff) | |
| download | zig-3200ebc2ea5f6bb51130cbc69d6533144a9f4ddc.tar.gz zig-3200ebc2ea5f6bb51130cbc69d6533144a9f4ddc.zip | |
Merge branch 'llvm6'
Zig now depends on LLVM 6.0.0.
The latest commit that depends on LLVM 5.0.1 is
2e010c60ae006944ae20ab8b3445598471c9f1e8.
Diffstat (limited to 'c_headers/cuda_wrappers/algorithm')
| -rw-r--r-- | c_headers/cuda_wrappers/algorithm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/c_headers/cuda_wrappers/algorithm b/c_headers/cuda_wrappers/algorithm index 95d9beb73c..cedd70762c 100644 --- a/c_headers/cuda_wrappers/algorithm +++ b/c_headers/cuda_wrappers/algorithm @@ -80,7 +80,7 @@ min(const __T &__a, const __T &__b, __Cmp __cmp) { template <class __T> inline __device__ const __T & min(const __T &__a, const __T &__b) { - return __a < __b ? __b : __a; + return __a < __b ? __a : __b; } #ifdef _LIBCPP_END_NAMESPACE_STD |