3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for the IAR compiler

This commit is contained in:
jushar 2023-03-08 13:14:29 +01:00 committed by Martin Hořeňovský
parent 0a0ebf5003
commit 3220ae6d4a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/catch2/benchmark/catch_optimizer.hpp
View File

@ -10,7 +10,7 @@
#ifndef CATCH_OPTIMIZER_HPP_INCLUDED #ifndef CATCH_OPTIMIZER_HPP_INCLUDED
#define CATCH_OPTIMIZER_HPP_INCLUDED #define CATCH_OPTIMIZER_HPP_INCLUDED
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
# include <atomic> // atomic_thread_fence # include <atomic> // atomic_thread_fence
#endif #endif
@ -32,16 +32,23 @@ namespace Catch {
namespace Detail { namespace Detail {
inline void optimizer_barrier() { keep_memory(); } inline void optimizer_barrier() { keep_memory(); }
} // namespace Detail } // namespace Detail
#elif defined(_MSC_VER) #elif defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
#if defined(_MSVC_VER)
#pragma optimize("", off) #pragma optimize("", off)
#elif defined(__IAR_SYSTEMS_ICC__)
// For IAR the pragma only affects the following function
#pragma optimize=disable
#endif
template <typename T> template <typename T>
inline void keep_memory(T* p) { inline void keep_memory(T* p) {
// thanks @milleniumbug // thanks @milleniumbug
*reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p); *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
} }
// TODO equivalent keep_memory() // TODO equivalent keep_memory()
#if defined(_MSVC_VER)
#pragma optimize("", on) #pragma optimize("", on)
#endif
namespace Detail { namespace Detail {
inline void optimizer_barrier() { inline void optimizer_barrier() {

2
src/catch2/reporters/catch_reporter_junit.cpp
View File

@ -33,6 +33,8 @@ namespace Catch {
gmtime_s(&timeInfo, &rawtime); gmtime_s(&timeInfo, &rawtime);
#elif defined (CATCH_PLATFORM_PLAYSTATION) #elif defined (CATCH_PLATFORM_PLAYSTATION)
gmtime_s(&rawtime, &timeInfo); gmtime_s(&rawtime, &timeInfo);
#elif defined (__IAR_SYSTEMS_ICC__)
timeInfo = *std::gmtime(&rawtime);
#else #else
gmtime_r(&rawtime, &timeInfo); gmtime_r(&rawtime, &timeInfo);
#endif #endif