fix dynamic exception deprication for newer C++ versions
This commit is contained in:
parent
0f28e701ff
commit
54320c0d8e
3 changed files with 2 additions and 3 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
|
||||||
|
|
||||||
project(minisat)
|
project(minisat)
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------------------------
|
#--------------------------------------------------------------------------------------------------
|
||||||
# Configurable options:
|
# Configurable options:
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,6 @@ void putUInt(File& out, uint64 val)
|
||||||
|
|
||||||
|
|
||||||
uint64 getUInt(File& in)
|
uint64 getUInt(File& in)
|
||||||
throw(Exception_EOF)
|
|
||||||
{
|
{
|
||||||
uint byte0, byte1, byte2, byte3, byte4, byte5, byte6, byte7;
|
uint byte0, byte1, byte2, byte3, byte4, byte5, byte6, byte7;
|
||||||
byte0 = in.getChar();
|
byte0 = in.getChar();
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
void putUInt (File& out, uint64 val);
|
void putUInt (File& out, uint64 val);
|
||||||
uint64 getUInt (File& in) throw(Exception_EOF);
|
uint64 getUInt (File& in);
|
||||||
static inline uint64 encode64(int64 val) { return (val >= 0) ? (uint64)val << 1 : (((uint64)(~val) << 1) | 1); }
|
static inline uint64 encode64(int64 val) { return (val >= 0) ? (uint64)val << 1 : (((uint64)(~val) << 1) | 1); }
|
||||||
static inline int64 decode64(uint64 val) { return ((val & 1) == 0) ? (int64)(val >> 1) : ~(int64)(val >> 1); }
|
static inline int64 decode64(uint64 val) { return ((val & 1) == 0) ? (int64)(val >> 1) : ~(int64)(val >> 1); }
|
||||||
static inline void putInt (File& out, int64 val) { putUInt(out, encode64(val)); }
|
static inline void putInt (File& out, int64 val) { putUInt(out, encode64(val)); }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue