aboutsummaryrefslogtreecommitdiffstats
path: root/common/alexcpt.h
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-09-20 14:40:12 -0700
committerChris Robinson <[email protected]>2019-09-20 14:40:12 -0700
commit2ae1f8b8b64c2f1397649686507dabf72f4b8667 (patch)
treee162dec1df7757bf35ffa266912a9651273d47aa /common/alexcpt.h
parent2ab4883439b1bc96578e86cc894504b9a1d1021b (diff)
Revert "Silence some unreachable code warnings on MSVC"
This reverts commit 2ab4883439b1bc96578e86cc894504b9a1d1021b. It apparently didn't work at silencing anything.
Diffstat (limited to 'common/alexcpt.h')
-rw-r--r--common/alexcpt.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/common/alexcpt.h b/common/alexcpt.h
index 654520cb..ff09bab2 100644
--- a/common/alexcpt.h
+++ b/common/alexcpt.h
@@ -31,18 +31,6 @@ public:
#define START_API_FUNC try
-#ifndef _MSC_VER
#define END_API_FUNC catch(...) { std::terminate(); }
-#else
-/* VS 2015 complains that some of these catch statements are unreachable code,
- * due to the function body not able to throw anything. While technically true,
- * it's preferable to mark API functions just in case that ever changes, so
- * silence that warning.
- */
-#define END_API_FUNC __pragma(warning(push)) \
-__pragma(warning(disable : 4702)) \
-catch(...) { std::terminate(); } \
-__pragma(warning(pop))
-#endif
#endif /* ALEXCPT_H */