Skip to content

Commit

Permalink
Update libcxx/support
Browse files Browse the repository at this point in the history
  • Loading branch information
morzhovets committed Dec 5, 2023
1 parent 7290031 commit c1fdae9
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions test/sources/libcxx/support/count_new.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ class MemCounter

public:
// All checks return true when disable_checking is enabled.
static const bool disable_checking;
//static const bool disable_checking;
#ifdef DISABLE_NEW_COUNT
static const bool disable_checking = true;
#else
static const bool disable_checking = false;
#endif

// Disallow any allocations from occurring. Useful for testing that
// code doesn't perform any allocations.
Expand Down Expand Up @@ -359,11 +364,11 @@ class MemCounter
}
};

#ifdef DISABLE_NEW_COUNT
const bool MemCounter::disable_checking = true;
#else
const bool MemCounter::disable_checking = false;
#endif
//#ifdef DISABLE_NEW_COUNT
// const bool MemCounter::disable_checking = true;
//#else
// const bool MemCounter::disable_checking = false;
//#endif

TEST_DIAGNOSTIC_PUSH
TEST_MSVC_DIAGNOSTIC_IGNORED(4640) // '%s' construction of local static object is not thread safe (/Zc:threadSafeInit-)
Expand Down

0 comments on commit c1fdae9

Please sign in to comment.