Commit 06971a26 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

get rid of SPOT_DELETED

It was only needed with Swig versions older than what we have now.

* src/misc/common.hh: Here.
* src/misc/bitvect.hh, src/misc/common.hh, src/ta/taexplicit.hh,
src/ta/taproduct.hh, src/tl/simplify.hh, src/twa/bdddict.hh,
src/twa/taatgba.hh, src/twa/twaproduct.hh: Use = delete directly.
parent 17a7a782
......@@ -467,8 +467,8 @@ namespace spot
{
}
SPOT_LOCAL bitvect_array(const bitvect_array&) SPOT_DELETED;
SPOT_LOCAL void operator=(const bitvect_array&) SPOT_DELETED;
SPOT_LOCAL bitvect_array(const bitvect_array&) = delete;
SPOT_LOCAL void operator=(const bitvect_array&) = delete;
// Extra storage has been allocated at the end of the struct.
char* storage()
......
......@@ -75,15 +75,10 @@
#define SPOT_API_VAR extern SPOT_API
// Swig 2.0 does not understand '= delete'. This already
// works with the development version of Swig 3.
// Swig 3.0.2 still does not understand 'final' when used
// Swig 3.0.2 does not understand 'final' when used
// at class definition.
#ifdef SWIG
#define SPOT_DELETED
#define final
#else
#define SPOT_DELETED = delete
#endif
......
......@@ -118,8 +118,8 @@ namespace spot
private:
// Disallow copy.
ta_explicit(const ta_explicit& other) SPOT_DELETED;
ta_explicit& operator=(const ta_explicit& other) SPOT_DELETED;
ta_explicit(const ta_explicit& other) = delete;
ta_explicit& operator=(const ta_explicit& other) = delete;
const_twa_ptr tgba_;
state_ta_explicit* artificial_initial_state_;
......
......@@ -194,8 +194,8 @@ namespace spot
const_kripke_ptr kripke_;
// Disallow copy.
ta_product(const ta_product&) SPOT_DELETED;
ta_product& operator=(const ta_product&) SPOT_DELETED;
ta_product(const ta_product&) = delete;
ta_product& operator=(const ta_product&) = delete;
};
......
......@@ -195,7 +195,7 @@ namespace spot
private:
ltl_simplifier_cache* cache_;
// Copy disallowed.
ltl_simplifier(const ltl_simplifier&) SPOT_DELETED;
void operator=(const ltl_simplifier&) SPOT_DELETED;
ltl_simplifier(const ltl_simplifier&) = delete;
void operator=(const ltl_simplifier&) = delete;
};
}
......@@ -309,8 +309,8 @@ namespace spot
private:
// Disallow copy.
bdd_dict(const bdd_dict& other) SPOT_DELETED;
bdd_dict& operator=(const bdd_dict& other) SPOT_DELETED;
bdd_dict(const bdd_dict& other) = delete;
bdd_dict& operator=(const bdd_dict& other) = delete;
};
typedef std::shared_ptr<bdd_dict> bdd_dict_ptr;
......
......@@ -70,8 +70,8 @@ namespace spot
private:
// Disallow copy.
taa_tgba(const taa_tgba& other) SPOT_DELETED;
taa_tgba& operator=(const taa_tgba& other) SPOT_DELETED;
taa_tgba(const taa_tgba& other) = delete;
taa_tgba& operator=(const taa_tgba& other) = delete;
};
/// Set of states deriving from spot::state.
......
......@@ -114,8 +114,8 @@ namespace spot
private:
// Disallow copy.
twa_product(const twa_product&) SPOT_DELETED;
twa_product& operator=(const twa_product&) SPOT_DELETED;
twa_product(const twa_product&) = delete;
twa_product& operator=(const twa_product&) = delete;
};
/// \brief A lazy product with different initial states.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment