summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-05-26 10:35:09 -0600
committerCharles Harris <charlesr.harris@gmail.com>2016-05-26 10:35:09 -0600
commit0cccc797618da1c673aa2a4767daf7a91df579fa (patch)
tree2d04e923f1d92a592a35bd9196c59346bb8036e9
parenta075c360125476a796701477c49c2a6aafb8a228 (diff)
parent5a066240b6ea4a8a3a5172ef426a19d0721ddfe5 (diff)
downloadnumpy-0cccc797618da1c673aa2a4767daf7a91df579fa.tar.gz
Merge pull request #7679 from charris/fixup-c++-comment
MAINT: Fix up C++ comment in arraytypes.c.src.
-rw-r--r--numpy/core/src/multiarray/arraytypes.c.src13
1 files changed, 7 insertions, 6 deletions
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index dfda501d6..07df4541e 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -3763,12 +3763,13 @@ static void
}
}
else {
-// Visual Studio 2015 loop vectorizer handles NaN in an unexpected manner, see:
-// https://github.com/numpy/numpy/issues/7601
-// https://connect.microsoft.com/VisualStudio/feedback/details/2723801/unexpected-nan-handling-in-vectorized-loop
-#if (_MSC_VER == 1900)
-#pragma loop( no_vector )
-#endif
+ /*
+ * Visual Studio 2015 loop vectorizer handles NaN in an unexpected
+ * manner, see: https://github.com/numpy/numpy/issues/7601
+ */
+ #if (_MSC_VER == 1900)
+ #pragma loop( no_vector )
+ #endif
for (i = 0; i < ni; i++) {
if (@lt@(in[i], min_val)) {
out[i] = min_val;