mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

replace remaining volatiles with atomic<>

Browse source 
volatiles are now deprecated in recent C++
This commit is contained in:
Nuno Lopes 2020-10-24 11:47:45 +01:00
parent a4aa87b6c9
commit 0213af3c61
7 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/util/debug.cpp
View file

@ -21,11 +21,12 @@ Revision History:
#include<unistd.h>
#endif
#include<iostream>
#include "util/mutex.h"
#include "util/str_hashtable.h"
#include "util/z3_exception.h"
#include "util/z3_version.h"
static volatile bool g_enable_assertions = true;
static atomic<bool> g_enable_assertions(true);
void enable_assertions(bool f) {
g_enable_assertions = f;

3
src/util/rlimit.h
View file

@ -19,6 +19,7 @@ Revision History:
#pragma once
#include "util/vector.h"
#include <atomic>
void initialize_rlimit();
void finalize_rlimit();
@ -28,7 +29,7 @@ void finalize_rlimit();
*/
class reslimit {
volatile unsigned m_cancel;
std::atomic<unsigned> m_cancel;
bool m_suspend;
uint64_t m_count;
uint64_t m_limit;

7
src/util/vector.h
View file

@ -133,8 +133,13 @@ public:
}
vector(SZ s) {
m_data = nullptr;
init(s);
}
void init(SZ s) {
SASSERT(m_data == nullptr;);
if (s == 0) {
m_data = nullptr;
return;
}
SZ * mem = reinterpret_cast<SZ*>(memory::allocate(sizeof(T) * s + sizeof(SZ) * 2));