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.
This commit is contained in:
Alexandre Duret-Lutz 2015-10-01 20:06:39 +02:00
parent 17a7a782a9
commit 06971a2698
8 changed files with 15 additions and 20 deletions

View file

@ -467,8 +467,8 @@ namespace spot
{ {
} }
SPOT_LOCAL bitvect_array(const bitvect_array&) SPOT_DELETED; SPOT_LOCAL bitvect_array(const bitvect_array&) = delete;
SPOT_LOCAL void operator=(const bitvect_array&) SPOT_DELETED; SPOT_LOCAL void operator=(const bitvect_array&) = delete;
// Extra storage has been allocated at the end of the struct. // Extra storage has been allocated at the end of the struct.
char* storage() char* storage()

View file

@ -75,15 +75,10 @@
#define SPOT_API_VAR extern SPOT_API #define SPOT_API_VAR extern SPOT_API
// Swig 2.0 does not understand '= delete'. This already // Swig 3.0.2 does not understand 'final' when used
// works with the development version of Swig 3.
// Swig 3.0.2 still does not understand 'final' when used
// at class definition. // at class definition.
#ifdef SWIG #ifdef SWIG
#define SPOT_DELETED
#define final #define final
#else
#define SPOT_DELETED = delete
#endif #endif

View file

@ -118,8 +118,8 @@ namespace spot
private: private:
// Disallow copy. // Disallow copy.
ta_explicit(const ta_explicit& other) SPOT_DELETED; ta_explicit(const ta_explicit& other) = delete;
ta_explicit& operator=(const ta_explicit& other) SPOT_DELETED; ta_explicit& operator=(const ta_explicit& other) = delete;
const_twa_ptr tgba_; const_twa_ptr tgba_;
state_ta_explicit* artificial_initial_state_; state_ta_explicit* artificial_initial_state_;

View file

@ -194,8 +194,8 @@ namespace spot
const_kripke_ptr kripke_; const_kripke_ptr kripke_;
// Disallow copy. // Disallow copy.
ta_product(const ta_product&) SPOT_DELETED; ta_product(const ta_product&) = delete;
ta_product& operator=(const ta_product&) SPOT_DELETED; ta_product& operator=(const ta_product&) = delete;
}; };

View file

@ -195,7 +195,7 @@ namespace spot
private: private:
ltl_simplifier_cache* cache_; ltl_simplifier_cache* cache_;
// Copy disallowed. // Copy disallowed.
ltl_simplifier(const ltl_simplifier&) SPOT_DELETED; ltl_simplifier(const ltl_simplifier&) = delete;
void operator=(const ltl_simplifier&) SPOT_DELETED; void operator=(const ltl_simplifier&) = delete;
}; };
} }

View file

@ -309,8 +309,8 @@ namespace spot
private: private:
// Disallow copy. // Disallow copy.
bdd_dict(const bdd_dict& other) SPOT_DELETED; bdd_dict(const bdd_dict& other) = delete;
bdd_dict& operator=(const bdd_dict& other) SPOT_DELETED; bdd_dict& operator=(const bdd_dict& other) = delete;
}; };
typedef std::shared_ptr<bdd_dict> bdd_dict_ptr; typedef std::shared_ptr<bdd_dict> bdd_dict_ptr;

View file

@ -70,8 +70,8 @@ namespace spot
private: private:
// Disallow copy. // Disallow copy.
taa_tgba(const taa_tgba& other) SPOT_DELETED; taa_tgba(const taa_tgba& other) = delete;
taa_tgba& operator=(const taa_tgba& other) SPOT_DELETED; taa_tgba& operator=(const taa_tgba& other) = delete;
}; };
/// Set of states deriving from spot::state. /// Set of states deriving from spot::state.

View file

@ -114,8 +114,8 @@ namespace spot
private: private:
// Disallow copy. // Disallow copy.
twa_product(const twa_product&) SPOT_DELETED; twa_product(const twa_product&) = delete;
twa_product& operator=(const twa_product&) SPOT_DELETED; twa_product& operator=(const twa_product&) = delete;
}; };
/// \brief A lazy product with different initial states. /// \brief A lazy product with different initial states.