diff --git a/bench/scc-stats/stats.cc b/bench/scc-stats/stats.cc index b33eec0ee..81e0c75aa 100644 --- a/bench/scc-stats/stats.cc +++ b/bench/scc-stats/stats.cc @@ -1,5 +1,5 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et +// Copyright (C) 2009, 2010, 2012, 2013 Laboratoire de Recherche et // Développement de l'Epita (LRDE). // // This file is part of Spot, a model checking library. @@ -28,7 +28,7 @@ namespace spot { unsigned tgba_size(const tgba* a) { - typedef Sgi::hash_set hash_type; hash_type seen; std::queue tovisit; diff --git a/bench/split-product/cutscc.cc b/bench/split-product/cutscc.cc index 6b48f3993..b8f1888ab 100644 --- a/bench/split-product/cutscc.cc +++ b/bench/split-product/cutscc.cc @@ -1,5 +1,5 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et +// Copyright (C) 2009, 2010, 2012, 2013 Laboratoire de Recherche et // Développement de l'Epita (LRDE). // // This file is part of Spot, a model checking library. @@ -38,7 +38,7 @@ namespace spot { unsigned tgba_size(const tgba* a) { - typedef Sgi::hash_set hash_type; hash_type seen; std::queue tovisit; diff --git a/iface/gspn/ssp.cc b/iface/gspn/ssp.cc index 7c1ce87c1..9ceead7ae 100644 --- a/iface/gspn/ssp.cc +++ b/iface/gspn/ssp.cc @@ -1,8 +1,9 @@ -// Copyright (C) 2008, 2011 Laboratoire de Recherche et Developpement -// de l'Epita (LRDE). +// -*- coding: utf-8 -*- +// Copyright (C) 2008, 2011, 2013 Laboratoire de Recherche et +// Développement de l'Epita (LRDE). // Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire -// d'Informatique de Paris 6 (LIP6), département Systèmes Répartis -// Coopératifs (SRC), Université Pierre et Marie Curie. +// d'Informatique de Paris 6 (LIP6), département Systèmes Répartis +// Coopératifs (SRC), Université Pierre et Marie Curie. // // This file is part of Spot, a model checking library. // @@ -610,8 +611,8 @@ namespace spot } protected: - typedef Sgi::hash_set set_type; + typedef std::unordered_set set_type; set_type states; }; @@ -895,15 +896,15 @@ namespace spot virtual numbered_state_heap_const_iterator* iterator() const; protected: - typedef Sgi::hash_map hash_type; + typedef std::unordered_map hash_type; hash_type h; ///< Map of visited states. typedef std::list state_list; - typedef Sgi::hash_map f_map; - typedef Sgi::hash_map > contained_map; + typedef std::unordered_map f_map; + typedef std::unordered_map > contained_map; contained_map contained; friend class numbered_state_heap_ssp_const_iterator; diff --git a/src/bin/ltlcross.cc b/src/bin/ltlcross.cc index 137def2ba..37eda3874 100644 --- a/src/bin/ltlcross.cc +++ b/src/bin/ltlcross.cc @@ -1190,8 +1190,8 @@ namespace } typedef - Sgi::hash_set > fset_t; + std::unordered_set > fset_t; class processor: public job_processor diff --git a/src/bin/ltlfilt.cc b/src/bin/ltlfilt.cc index 5dfd27de7..02d6340d2 100644 --- a/src/bin/ltlfilt.cc +++ b/src/bin/ltlfilt.cc @@ -385,8 +385,9 @@ parse_opt(int key, char* arg, struct argp_state*) return 0; } -typedef Sgi::hash_set > fset_t; +typedef +std::unordered_set> fset_t; namespace { diff --git a/src/bin/randltl.cc b/src/bin/randltl.cc index b3730f31d..9b69f3359 100644 --- a/src/bin/randltl.cc +++ b/src/bin/randltl.cc @@ -344,8 +344,9 @@ main(int argc, char** argv) error(2, 0, "No atomic proposition supplied? Run '%s --help' for usage.", program_name); - typedef Sgi::hash_set > fset_t; + typedef + std::unordered_set> fset_t; fset_t unique_set; diff --git a/src/dstarparse/nsa2tgba.cc b/src/dstarparse/nsa2tgba.cc index 39a53efde..5cabb39b9 100644 --- a/src/dstarparse/nsa2tgba.cc +++ b/src/dstarparse/nsa2tgba.cc @@ -90,8 +90,8 @@ namespace spot }; // Associate the build state to its number. - typedef Sgi::hash_map bs2num_map; + typedef std::unordered_map bs2num_map; // Queue of state to be processed. typedef std::deque queue_t; diff --git a/src/ltlast/formula.hh b/src/ltlast/formula.hh index 2dd03760c..3170842bb 100644 --- a/src/ltlast/formula.hh +++ b/src/ltlast/formula.hh @@ -497,14 +497,14 @@ namespace spot /// \brief Hash Function for const formula*. /// /// This is meant to be used as a hash functor for - /// Sgi's \c hash_map whose key are of type const formula*. + /// \c unordered_map whose key are of type const formula*. /// /// For instance here is how one could declare /// a map of \c const::formula*. /// \code /// // Remember how many times each formula has been seen. - /// Sgi::hash_map seen; + /// std::unordered_map seen; /// \endcode struct formula_ptr_hash: public std::unary_function diff --git a/src/ltlast/nfa.hh b/src/ltlast/nfa.hh index 32539f89f..397d68807 100644 --- a/src/ltlast/nfa.hh +++ b/src/ltlast/nfa.hh @@ -102,8 +102,8 @@ namespace spot private: state* add_state(int name); - typedef Sgi::hash_map > is_map; - typedef Sgi::hash_map > si_map; + typedef std::unordered_map> is_map; + typedef std::unordered_map> si_map; is_map is_; si_map si_; diff --git a/src/ltlvisit/contain.hh b/src/ltlvisit/contain.hh index 03d5c6205..e2fab0cf4 100644 --- a/src/ltlvisit/contain.hh +++ b/src/ltlvisit/contain.hh @@ -41,8 +41,8 @@ namespace spot typedef std::map incomp_map; incomp_map incompatible; }; - typedef Sgi::hash_map trans_map; + typedef std::unordered_map trans_map; public: /// This class uses spot::ltl_to_tgba_fm to translate LTL /// formulae. See that function for the meaning of these options. diff --git a/src/ltlvisit/dotty.cc b/src/ltlvisit/dotty.cc index 2fe5f81d4..59bf1dc6b 100644 --- a/src/ltlvisit/dotty.cc +++ b/src/ltlvisit/dotty.cc @@ -1,5 +1,5 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et +// Copyright (C) 2009, 2010, 2011, 2012, 2013 Laboratoire de Recherche et // Développement de l'Epita (LRDE). // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 // (LIP6), département Systèmes Répartis Coopératifs (SRC), Université @@ -36,7 +36,7 @@ namespace spot class dotty_visitor: public visitor { public: - typedef Sgi::hash_map > map; + typedef std::unordered_map> map; dotty_visitor(std::ostream& os, map& m) : os_(os), father_(-1), node_(m), sinks_(new std::ostringstream) { diff --git a/src/ltlvisit/mark.hh b/src/ltlvisit/mark.hh index c1521542b..a77786b91 100644 --- a/src/ltlvisit/mark.hh +++ b/src/ltlvisit/mark.hh @@ -1,5 +1,6 @@ -// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et -// Développement de l'Epita (LRDE). +// -*- coding: utf-8 -*- +// Copyright (C) 2010, 2011, 2012, 2013 Laboratoire de Recherche et +// Développement de l'Epita (LRDE). // // This file is part of Spot, a model checking library. // @@ -42,8 +43,8 @@ namespace spot ~mark_tools(); private: - typedef Sgi::hash_map > f2f_map; + typedef std::unordered_map> f2f_map; f2f_map simpmark_; f2f_map markops_; visitor* simpvisitor_; diff --git a/src/ltlvisit/relabel.cc b/src/ltlvisit/relabel.cc index 993787cc6..0f06bc682 100644 --- a/src/ltlvisit/relabel.cc +++ b/src/ltlvisit/relabel.cc @@ -91,8 +91,8 @@ namespace spot class relabeler: public clone_visitor { public: - typedef Sgi::hash_map > map; + typedef std::unordered_map > map; map newname; ap_generator* gen; relabeling_map* oldnames; @@ -363,8 +363,8 @@ namespace spot unsigned num; // serial number, in pre-order unsigned low; // lowest number accessible via unstacked descendants }; - typedef Sgi::hash_map fmap_t; + typedef std::unordered_map fmap_t; struct stack_entry { const formula* grand_parent; diff --git a/src/ltlvisit/relabel.hh b/src/ltlvisit/relabel.hh index 75cc7bef7..8b33da9da 100644 --- a/src/ltlvisit/relabel.hh +++ b/src/ltlvisit/relabel.hh @@ -30,9 +30,9 @@ namespace spot enum relabeling_style { Abc, Pnn }; - struct relabeling_map: public Sgi::hash_map > + struct relabeling_map: public std::unordered_map> { ~relabeling_map() { diff --git a/src/ltlvisit/simplify.cc b/src/ltlvisit/simplify.cc index 3d57e8647..58ed3db0f 100644 --- a/src/ltlvisit/simplify.cc +++ b/src/ltlvisit/simplify.cc @@ -44,10 +44,10 @@ namespace spot // The name of this class is public, but not its contents. class ltl_simplifier_cache { - typedef Sgi::hash_map > f2f_map; - typedef Sgi::hash_map > f2b_map; + typedef std::unordered_map> f2f_map; + typedef std::unordered_map> f2b_map; typedef std::pair pairf; typedef std::map syntimpl_cache_t; public: @@ -2857,11 +2857,11 @@ namespace spot // a & (b | X(b M a)) = b M a if (!mo->is_X_free()) { - typedef Sgi::hash_set > fset_t; - typedef Sgi::hash_map, - ptr_hash > fmap_t; + typedef std::unordered_set> fset_t; + typedef std::unordered_map, + ptr_hash> fmap_t; fset_t xgset; // XG(...) fset_t xset; // X(...) fmap_t wuset; // (X...)W(...) or (X...)U(...) @@ -3131,9 +3131,9 @@ namespace spot // F(a) & (a M b) = a M b // F(b) & (a W b) = a U b // F(b) & (a U b) = a U b - typedef Sgi::hash_map > fmap_t; + typedef std::unordered_map> fmap_t; fmap_t uwmap; // associates "b" to "a U b" or "a W b" fmap_t rmmap; // associates "a" to "a R b" or "a M b" // (a U b) & (c U b) = (a & c) U b @@ -3606,11 +3606,11 @@ namespace spot // a | (b & X(b U a)) = b U a if (!mo->is_X_free()) { - typedef Sgi::hash_set > fset_t; - typedef Sgi::hash_map, - ptr_hash > fmap_t; + typedef std::unordered_set> fset_t; + typedef std::unordered_map, + ptr_hash> fmap_t; fset_t xfset; // XF(...) fset_t xset; // X(...) fmap_t rmset; // (X...)R(...) or (X...)M(...) or @@ -3922,9 +3922,9 @@ namespace spot // G(a) | (a W b) = a W b // G(b) | (a R b) = a R b. // G(b) | (a M b) = a R b. - typedef Sgi::hash_map > fmap_t; + typedef std::unordered_map> fmap_t; fmap_t uwmap; // associates "a" to "a U b" or "a W b" fmap_t rmmap; // associates "b" to "a R b" or "a M b" // (a U b) | (a U c) = a U (b | c) diff --git a/src/ltlvisit/snf.hh b/src/ltlvisit/snf.hh index 391f40309..b62dc1e48 100644 --- a/src/ltlvisit/snf.hh +++ b/src/ltlvisit/snf.hh @@ -28,8 +28,8 @@ namespace spot namespace ltl { - typedef Sgi::hash_map > snf_cache; + typedef std::unordered_map> snf_cache; /// Helper to rewrite a sere in Star Normal Form. /// diff --git a/src/misc/hash.hh b/src/misc/hash.hh index ad2b4287b..625337bf3 100644 --- a/src/misc/hash.hh +++ b/src/misc/hash.hh @@ -30,10 +30,6 @@ # include # include - namespace Sgi = std; -# define hash_map unordered_map -# define hash_multimap unordered_multimap -# define hash_set unordered_set namespace spot { @@ -60,7 +56,7 @@ namespace spot /// \ingroup hash_funcs /// \brief A hash function for strings. - typedef Sgi::hash string_hash; + typedef std::hash string_hash; /// \ingroup hash_funcs /// \brief A hash function that returns identity diff --git a/src/misc/mspool.hh b/src/misc/mspool.hh index 2f399a324..34d64e9e2 100644 --- a/src/misc/mspool.hh +++ b/src/misc/mspool.hh @@ -1,5 +1,6 @@ -// Copyright (C) 2011 Laboratoire de Recherche et Developpement de -// l'Epita (LRDE) +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de Recherche et Developpement +// de l'Epita (LRDE) // // This file is part of Spot, a model checking library. // @@ -117,7 +118,7 @@ namespace spot private: struct block_ { block_* next; }; - Sgi::hash_map freelist_; + std::unordered_map freelist_; char* free_start_; char* free_end_; // chunk = several agglomerated blocks diff --git a/src/priv/acccompl.hh b/src/priv/acccompl.hh index 7d1b42ac5..43433e552 100644 --- a/src/priv/acccompl.hh +++ b/src/priv/acccompl.hh @@ -48,7 +48,7 @@ namespace spot protected: const bdd all_; const bdd neg_; - typedef Sgi::hash_map bdd_cache_t; + typedef std::unordered_map bdd_cache_t; bdd_cache_t cache_; }; } // End namespace Spot diff --git a/src/priv/accconv.hh b/src/priv/accconv.hh index 4fa5f28ad..00ef88737 100644 --- a/src/priv/accconv.hh +++ b/src/priv/accconv.hh @@ -41,7 +41,7 @@ namespace spot protected: bdd allneg_; - typedef Sgi::hash_map bdd_cache_t; + typedef std::unordered_map bdd_cache_t; bdd_cache_t pos_prod_cache_; bdd_cache_t full_prod_cache_; }; diff --git a/src/saba/explicitstateconjunction.hh b/src/saba/explicitstateconjunction.hh index a9c1735b3..ed0c36e79 100644 --- a/src/saba/explicitstateconjunction.hh +++ b/src/saba/explicitstateconjunction.hh @@ -66,9 +66,9 @@ namespace spot /// The class becomes owner of \a state. void add(saba_state* state); private: - typedef Sgi::hash_set saba_state_set_t; + typedef std::unordered_set saba_state_set_t; saba_state_set_t set_; saba_state_set_t::iterator it_; }; diff --git a/src/saba/sabastate.hh b/src/saba/sabastate.hh index 0d317952c..efa05263d 100644 --- a/src/saba/sabastate.hh +++ b/src/saba/sabastate.hh @@ -52,9 +52,10 @@ namespace spot /// /// Note that the hash value is guaranteed to be unique for all /// equal states (in compare()'s sense) for only has long has one - /// of these states exists. So it's OK to use a spot::saba_state as a - /// key in a \c hash_map because the mere use of the state as a - /// key in the hash will ensure the state continues to exist. + /// of these states exists. So it's OK to use a spot::saba_state + /// as a key in an \c unordered_map because the mere use of the + /// state as a key in the hash will ensure the state continues to + /// exist. /// /// However if you create the state, get its hash key, delete the /// state, recreate the same state, and get its hash key, you may @@ -63,7 +64,7 @@ namespace spot /// occur only when the state is BDD-encoded, because BDD numbers /// (used to build the hash value) can be reused for other /// formulas. That probably doesn't matter, since the hash value - /// is meant to be used in a \c hash_map, but it had to be noted. + /// is meant to be used in an \c unordered_map, but it had to be noted. virtual size_t hash() const = 0; /// Duplicate a state. @@ -107,13 +108,13 @@ namespace spot /// \brief An Equivalence Relation for \c saba_state*. /// /// This is meant to be used as a comparison functor for - /// Sgi \c hash_map whose key are of type \c saba_state*. + /// \c unordered_map whose keys are of type \c saba_state*. /// /// For instance here is how one could declare /// a map of \c saba_state*. /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; /// \endcode struct saba_state_ptr_equal: @@ -132,13 +133,13 @@ namespace spot /// \brief Hash Function for \c saba_state*. /// /// This is meant to be used as a hash functor for - /// Sgi's \c hash_map whose key are of type \c saba_state*. + /// an \c unordered_map whose keys are of type \c saba_state*. /// /// For instance here is how one could declare /// a map of \c saba_state*. /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; /// \endcode struct saba_state_ptr_hash: @@ -162,7 +163,7 @@ namespace spot /// (shared_ptr). /// /// This is meant to be used as a comparison functor for - /// STL \c map whose key are of type \c shared_saba_state. + /// STL \c map whose keys are of type \c shared_saba_state. /// /// For instance here is how one could declare /// a map of \c shared_saba_state. @@ -189,15 +190,15 @@ namespace spot /// (shared_ptr). /// /// This is meant to be used as a comparison functor for - /// Sgi \c hash_map whose key are of type \c shared_saba_state. + /// an \c unordred_map whose keys are of type \c shared_saba_state. /// /// For instance here is how one could declare /// a map of \c shared_saba_state /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; + /// std::unordered_map seen; /// \endcode struct saba_state_shared_ptr_equal: public std::binary_function). /// /// This is meant to be used as a hash functor for - /// Sgi's \c hash_map whose key are of type + /// \c unordered_map whose key are of type /// \c shared_saba_state. /// /// For instance here is how one could declare /// a map of \c shared_saba_state. /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; + /// std::unordered_map seen; /// \endcode struct saba_state_shared_ptr_hash: public std::unary_function diff --git a/src/sabaalgos/sabareachiter.hh b/src/sabaalgos/sabareachiter.hh index b52c4b103..f2674d3c0 100644 --- a/src/sabaalgos/sabareachiter.hh +++ b/src/sabaalgos/sabareachiter.hh @@ -108,8 +108,9 @@ namespace spot protected: const saba* automata_; ///< The spot::saba to explore. - typedef Sgi::hash_map seen_map; + typedef + std::unordered_map seen_map; seen_map seen; ///< States already seen. }; diff --git a/src/sanity/style.test b/src/sanity/style.test index f92e2cea4..d4a161f06 100755 --- a/src/sanity/style.test +++ b/src/sanity/style.test @@ -238,12 +238,6 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do grep '[^a-zA-Z0-9_](\*[a-zA-Z0-9_]*)\.' $tmp && diag 'Use "x->y", not "(*x).y"' - grep 'std::hash' $tmp && - diag 'use Sgi:: for hash and hash_map' - - grep 'Sgi::[^h]' $tmp && - diag 'Sgi:: is for hash and hash_map only' - egrep 'bdd_(false|true)[ ]*\(' $tmp && diag 'Use bddfalse and bddtrue instead of bdd_false() and bdd_true()' diff --git a/src/ta/taexplicit.cc b/src/ta/taexplicit.cc index 40086f1b1..b251bada5 100644 --- a/src/ta/taexplicit.cc +++ b/src/ta/taexplicit.cc @@ -116,7 +116,7 @@ namespace spot state_ta_explicit::get_transitions(bdd condition) const { - Sgi::hash_map >::const_iterator i = + std::unordered_map >::const_iterator i = transitions_by_condition.find(condition.id()); if (i == transitions_by_condition.end()) @@ -334,8 +334,8 @@ namespace spot } delete trans; - Sgi::hash_map >::iterator i = - transitions_by_condition.begin(); + std::unordered_map >::iterator i = + transitions_by_condition.begin(); while (i != transitions_by_condition.end()) { delete i->second; diff --git a/src/ta/taexplicit.hh b/src/ta/taexplicit.hh index 6b45a778f..e32d3e414 100644 --- a/src/ta/taexplicit.hh +++ b/src/ta/taexplicit.hh @@ -236,7 +236,8 @@ namespace spot bool is_accepting_state_; bool is_livelock_accepting_state_; transitions* transitions_; - Sgi::hash_map > transitions_by_condition; + std::unordered_map> + transitions_by_condition; #endif // !SWIG }; diff --git a/src/taalgos/emptinessta.cc b/src/taalgos/emptinessta.cc index 190b4592b..37218e54b 100644 --- a/src/taalgos/emptinessta.cc +++ b/src/taalgos/emptinessta.cc @@ -1,5 +1,5 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et +// Copyright (C) 2010, 2011, 2012, 2013 Laboratoire de Recherche et // Développement de l'Epita (LRDE). // // This file is part of Spot, a model checking library. @@ -72,14 +72,15 @@ namespace spot // it is also used as a key in H. std::stack todo; - Sgi::hash_map - colour; + std::unordered_map colour; trace << "PASS 1" << std::endl; - Sgi::hash_map, - state_ptr_hash, state_ptr_equal> liveset; + std::unordered_map, + state_ptr_hash, state_ptr_equal> liveset; std::stack livelock_roots; diff --git a/src/taalgos/minimize.cc b/src/taalgos/minimize.cc index 079fd9acb..9c6484ebf 100644 --- a/src/taalgos/minimize.cc +++ b/src/taalgos/minimize.cc @@ -40,9 +40,10 @@ namespace spot { - typedef Sgi::hash_set hash_set; - typedef Sgi::hash_map - hash_map; + typedef std::unordered_set hash_set; + typedef std::unordered_map hash_map; typedef std::list partition_t; namespace diff --git a/src/taalgos/reachiter.hh b/src/taalgos/reachiter.hh index f1a428056..40c68a2f7 100644 --- a/src/taalgos/reachiter.hh +++ b/src/taalgos/reachiter.hh @@ -89,8 +89,8 @@ namespace spot const ta* t_automata_; ///< The spot::ta to explore. - typedef Sgi::hash_map - seen_map; + typedef std::unordered_map seen_map; seen_map seen; ///< States already seen. }; diff --git a/src/tgba/state.hh b/src/tgba/state.hh index a5e16e03d..52e9d6a36 100644 --- a/src/tgba/state.hh +++ b/src/tgba/state.hh @@ -127,13 +127,13 @@ namespace spot /// \brief An Equivalence Relation for \c state*. /// /// This is meant to be used as a comparison functor for - /// Sgi \c hash_map whose key are of type \c state*. + /// an \c unordered_map whose key are of type \c state*. /// /// For instance here is how one could declare /// a map of \c state*. /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; /// \endcode struct state_ptr_equal: @@ -152,13 +152,13 @@ namespace spot /// \brief Hash Function for \c state*. /// /// This is meant to be used as a hash functor for - /// Sgi's \c hash_map whose key are of type \c state*. + /// an \c unordered_map whose key are of type \c state*. /// /// For instance here is how one could declare /// a map of \c state*. /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; /// \endcode struct state_ptr_hash: @@ -172,9 +172,8 @@ namespace spot } }; - typedef Sgi::hash_set state_set; + typedef std::unordered_set state_set; // Functions related to shared_ptr. @@ -215,15 +214,15 @@ namespace spot /// (shared_ptr). /// /// This is meant to be used as a comparison functor for - /// Sgi \c hash_map whose key are of type \c shared_state. + /// un \c unordered_map whose key are of type \c shared_state. /// /// For instance here is how one could declare /// a map of \c shared_state /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; + /// std::unordered_map seen; /// \endcode struct state_shared_ptr_equal: public std::binary_function). /// /// This is meant to be used as a hash functor for - /// Sgi's \c hash_map whose key are of type + /// an \c unordered_map whose key are of type /// \c shared_state. /// /// For instance here is how one could declare /// a map of \c shared_state. /// \code /// // Remember how many times each state has been visited. - /// Sgi::hash_map seen; + /// std::unordered_map seen; /// \endcode struct state_shared_ptr_hash: public std::unary_function @@ -265,9 +264,9 @@ namespace spot } }; - typedef Sgi::hash_set shared_state_set; + typedef std::unordered_set shared_state_set; } diff --git a/src/tgba/taatgba.hh b/src/tgba/taatgba.hh index 20b649599..506fdfb58 100644 --- a/src/tgba/taatgba.hh +++ b/src/tgba/taatgba.hh @@ -127,9 +127,9 @@ namespace spot typedef taa_tgba::state::const_iterator iterator; typedef std::pair iterator_pair; typedef std::vector bounds_t; - typedef Sgi::hash_map< - const spot::set_state*, std::vector, - state_ptr_hash, state_ptr_equal> seen_map; + typedef std::unordered_map, + state_ptr_hash, state_ptr_equal> seen_map; struct distance_sort : public std::binary_function ns_map; - typedef Sgi::hash_map< - const taa_tgba::state*, label, ptr_hash - > sn_map; + typedef std::unordered_map ns_map; + typedef std::unordered_map> sn_map; ns_map name_state_map_; sn_map state_name_map_; diff --git a/src/tgba/tgbabddconcretefactory.hh b/src/tgba/tgbabddconcretefactory.hh index d3c74926d..ca83de4a3 100644 --- a/src/tgba/tgbabddconcretefactory.hh +++ b/src/tgba/tgbabddconcretefactory.hh @@ -93,8 +93,8 @@ namespace spot private: tgba_bdd_core_data data_; ///< Core data for the new automata. - typedef Sgi::hash_map acc_map_; + typedef std::unordered_map acc_map_; acc_map_ acc_; ///< BDD associated to each acceptance condition }; diff --git a/src/tgba/tgbaexplicit.hh b/src/tgba/tgbaexplicit.hh index b6915aa10..b12326158 100644 --- a/src/tgba/tgbaexplicit.hh +++ b/src/tgba/tgbaexplicit.hh @@ -261,9 +261,9 @@ namespace spot typedef typename State::transition transition; typedef State state; protected: - typedef Sgi::hash_map ls_map; - typedef Sgi::hash_map alias_map; - typedef Sgi::hash_map > sl_map; + typedef std::unordered_map ls_map; + typedef std::unordered_map alias_map; + typedef std::unordered_map > sl_map; public: @@ -397,8 +397,8 @@ namespace spot { typedef typename transitions_t::iterator trans_t; typedef std::map acc_map; - typedef Sgi::hash_map > dest_map; + typedef std::unordered_map > dest_map; typename ls_map::iterator i; for (i = ls_.begin(); i != ls_.end(); ++i) diff --git a/src/tgba/tgbakvcomplement.cc b/src/tgba/tgbakvcomplement.cc index 3e13e55bc..bd0b86c84 100644 --- a/src/tgba/tgbakvcomplement.cc +++ b/src/tgba/tgbakvcomplement.cc @@ -88,9 +88,9 @@ namespace spot }; // typedefs. - typedef Sgi::hash_map state_rank_map; + typedef std::unordered_map state_rank_map; //////////////////////////////////////// // state_kv_complement diff --git a/src/tgba/tgbasafracomplement.cc b/src/tgba/tgbasafracomplement.cc index d2eb770b2..70d94f427 100644 --- a/src/tgba/tgbasafracomplement.cc +++ b/src/tgba/tgbasafracomplement.cc @@ -763,8 +763,8 @@ namespace spot ////////////////////////////// namespace test { - typedef Sgi::hash_map stnum_t; + typedef std::unordered_map stnum_t; void print_safra_tree(const safra_tree* this_node, stnum_t& node_names, diff --git a/src/tgba/tgbatba.cc b/src/tgba/tgbatba.cc index 63a37971f..e055439a0 100644 --- a/src/tgba/tgbatba.cc +++ b/src/tgba/tgbatba.cc @@ -44,7 +44,7 @@ namespace spot } // Note: There is a default copy constructor, needed by - // Sgi::hash_set. It does not clone the state "s", because the + // std::unordered_set. It does not clone the state "s", because the // destructor will not destroy it either. Actually, the states // are all destroyed in the tgba_tba_proxy destructor. @@ -127,9 +127,9 @@ namespace spot } }; - typedef Sgi::hash_set uniq_map_t; + typedef std::unordered_set uniq_map_t; typedef std::pair state_ptr_bool_t; @@ -382,9 +382,9 @@ namespace spot protected: const bdd the_acceptance_cond_; - typedef Sgi::hash_map transmap_t; + typedef std::unordered_map transmap_t; transmap_t transmap_; typedef transmap_t::const_iterator mapit_t; typedef std::list translist_t; diff --git a/src/tgba/tgbatba.hh b/src/tgba/tgbatba.hh index 4645edad4..9c87c666d 100644 --- a/src/tgba/tgbatba.hh +++ b/src/tgba/tgbatba.hh @@ -111,8 +111,8 @@ namespace spot private: bdd the_acceptance_cond_; - typedef Sgi::hash_map accmap_t; + typedef std::unordered_map accmap_t; mutable accmap_t accmap_; mutable accmap_t accmapu_; diff --git a/src/tgbaalgos/cutscc.cc b/src/tgbaalgos/cutscc.cc index 89c6fae87..8565db4e3 100644 --- a/src/tgbaalgos/cutscc.cc +++ b/src/tgbaalgos/cutscc.cc @@ -35,8 +35,8 @@ namespace spot tgba_explicit_string* sub_a = new tgba_explicit_string(a->get_dict()); state* cur = a->get_init_state(); std::queue tovisit; - typedef Sgi::hash_set hash_type; + typedef std::unordered_set hash_type; // Setup hash_type seen; unsigned scc_number; diff --git a/src/tgbaalgos/cycles.hh b/src/tgbaalgos/cycles.hh index b7800ccc2..64a2fec1d 100644 --- a/src/tgbaalgos/cycles.hh +++ b/src/tgbaalgos/cycles.hh @@ -79,8 +79,8 @@ namespace spot class SPOT_API enumerate_cycles { protected: - typedef Sgi::hash_set set_type; + typedef std::unordered_set set_type; // Extra information required for the algorithm for each state. struct state_info @@ -105,8 +105,8 @@ namespace spot }; // Store the state_info for all visited states. - typedef Sgi::hash_map hash_type; + typedef std::unordered_map hash_type; hash_type tags_; // A tagged_state s is a state* (s->first) associated to its diff --git a/src/tgbaalgos/degen.cc b/src/tgbaalgos/degen.cc index a7e3e4760..5703145c3 100644 --- a/src/tgbaalgos/degen.cc +++ b/src/tgbaalgos/degen.cc @@ -60,8 +60,8 @@ namespace spot }; // Associate the degeneralized state to its number. - typedef Sgi::hash_map ds2num_map; + typedef std::unordered_map ds2num_map; // Queue of state to be processed. typedef std::deque queue_t; @@ -69,7 +69,7 @@ namespace spot // Memory management for the input states. class unicity_table { - typedef Sgi::hash_set uniq_set; uniq_set m; public: @@ -112,8 +112,8 @@ namespace spot { const tgba* a_; typedef std::pair cache_entry; - typedef Sgi::hash_map cache_t; + typedef std::unordered_map cache_t; cache_t cache_; const scc_map* sm_; @@ -170,8 +170,8 @@ namespace spot class has_acc_loop { const tgba* a_; - typedef Sgi::hash_map cache_t; + typedef std::unordered_map cache_t; cache_t cache_; unicity_table& uniq_; diff --git a/src/tgbaalgos/dtbasat.cc b/src/tgbaalgos/dtbasat.cc index d2f023934..5ae9b9eae 100644 --- a/src/tgbaalgos/dtbasat.cc +++ b/src/tgbaalgos/dtbasat.cc @@ -212,9 +212,9 @@ namespace spot std::map pathid_ref; std::map pathid_cand; int nvars; - typedef Sgi::hash_map state_map; - typedef Sgi::hash_map int_map; + typedef std::unordered_map state_map; + typedef std::unordered_map int_map; state_map state_to_int; int_map int_to_state; int cand_size; diff --git a/src/tgbaalgos/dtgbasat.cc b/src/tgbaalgos/dtgbasat.cc index 16ba90059..4b1b67224 100644 --- a/src/tgbaalgos/dtgbasat.cc +++ b/src/tgbaalgos/dtgbasat.cc @@ -260,9 +260,9 @@ namespace spot std::map pathid; int nvars; - typedef Sgi::hash_map state_map; - typedef Sgi::hash_map int_map; + typedef std::unordered_map state_map; + typedef std::unordered_map int_map; state_map state_to_int; int_map int_to_state; int cand_size; diff --git a/src/tgbaalgos/eltl2tgba_lacim.cc b/src/tgbaalgos/eltl2tgba_lacim.cc index ce44e06f4..5e5d37242 100644 --- a/src/tgbaalgos/eltl2tgba_lacim.cc +++ b/src/tgbaalgos/eltl2tgba_lacim.cc @@ -1,5 +1,6 @@ -// Copyright (C) 2008, 2009, 2010, 2012 Laboratoire de Recherche et -// Développement de l'Epita (LRDE). +// -*- coding: utf-8 -*- +// Copyright (C) 2008, 2009, 2010, 2012, 2013 Laboratoire de Recherche et +// Développement de l'Epita (LRDE). // // This file is part of Spot, a model checking library. // @@ -221,15 +222,16 @@ namespace spot bool root_; /// BDD associated to each automatop A representing finish(A). - typedef Sgi::hash_map finish_map_; + typedef std::unordered_map finish_map_; finish_map_ finish_; // Table containing the two now variables associated with each state. // TODO: a little documentation about that. - typedef Sgi::hash_map< - const nfa::state*, std::pair, ptr_hash > nmap; + typedef std::unordered_map, + ptr_hash> nmap; std::pair& recurse_state(const nfa::ptr& nfa, const nfa::state* s, diff --git a/src/tgbaalgos/emptiness.cc b/src/tgbaalgos/emptiness.cc index 2ed8cce51..02b391682 100644 --- a/src/tgbaalgos/emptiness.cc +++ b/src/tgbaalgos/emptiness.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2009, 2011, 2012 Laboratoire de Recherche et -// Développement de l'Epita (LRDE). +// -*- coding: utf-8 -*- +// Copyright (C) 2009, 2011, 2012, 2013 Laboratoire de Recherche et +// Développement de l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -305,8 +306,8 @@ namespace spot const tgba_run::steps* l; bdd seen_acc = bddfalse; - typedef Sgi::hash_map state_map; + typedef std::unordered_map state_map; state_map seen; if (run->prefix.empty()) diff --git a/src/tgbaalgos/gtec/explscc.hh b/src/tgbaalgos/gtec/explscc.hh index 992d4fa69..453d954d3 100644 --- a/src/tgbaalgos/gtec/explscc.hh +++ b/src/tgbaalgos/gtec/explscc.hh @@ -56,8 +56,8 @@ namespace spot virtual const state* has_state(const state* s) const; virtual void insert(const state* s); protected: - typedef Sgi::hash_set set_type; + typedef std::unordered_set set_type; set_type states; }; diff --git a/src/tgbaalgos/gtec/nsheap.hh b/src/tgbaalgos/gtec/nsheap.hh index 9ce345e89..eb6401bad 100644 --- a/src/tgbaalgos/gtec/nsheap.hh +++ b/src/tgbaalgos/gtec/nsheap.hh @@ -121,8 +121,8 @@ namespace spot virtual numbered_state_heap_const_iterator* iterator() const; - typedef Sgi::hash_map hash_type; + typedef std::unordered_map hash_type; protected: hash_type h; ///< Map of visited states. }; diff --git a/src/tgbaalgos/gv04.cc b/src/tgbaalgos/gv04.cc index 2f285860e..1eac8722c 100644 --- a/src/tgbaalgos/gv04.cc +++ b/src/tgbaalgos/gv04.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2008, 2010, 2011 Laboratoire de recherche et -// développement de l'Epita (LRDE). +// -*- coding: utf-8 -*- +// Copyright (C) 2008, 2010, 2011, 2013 Laboratoire de recherche et +// développement de l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 -// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université +// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université // Pierre et Marie Curie. // // This file is part of Spot, a model checking library. @@ -58,8 +59,8 @@ namespace spot bdd accepting; // Map of visited states. - typedef Sgi::hash_map hash_type; + typedef std::unordered_map hash_type; hash_type h; // Stack of visited states on the path. diff --git a/src/tgbaalgos/ltl2tgba_fm.cc b/src/tgbaalgos/ltl2tgba_fm.cc index bde8ec011..99bd3dc13 100644 --- a/src/tgbaalgos/ltl2tgba_fm.cc +++ b/src/tgbaalgos/ltl2tgba_fm.cc @@ -120,8 +120,8 @@ namespace spot private: translate_dict& dict_; std::vector automata_; - typedef Sgi::hash_map f2a_t; + typedef std::unordered_map f2a_t; f2a_t f2a_; }; @@ -218,8 +218,9 @@ namespace spot bool has_marked:1; }; - typedef Sgi::hash_map - flagged_formula_to_bdd_map; + typedef + std::unordered_map flagged_formula_to_bdd_map; private: flagged_formula_to_bdd_map ltl_bdd_; @@ -1893,7 +1894,8 @@ namespace spot } private: - typedef Sgi::hash_map pfl_map; + typedef std::unordered_map pfl_map; pfl_map pfl_; }; @@ -2039,13 +2041,14 @@ namespace spot // We do this because many formulae (such as `aR(bRc)' and // `aR(bRc).(bRc)') are equivalent, and are trivially identified // by looking at the set of successors. - typedef Sgi::hash_map bdd_to_formula_map; + typedef std::unordered_map bdd_to_formula_map; bdd_to_formula_map b2f_; // Map each formula to its associated bdd. This speed things up when // the same formula is translated several times, which especially // occurs when canonize() is called repeatedly inside exprop. - typedef Sgi::hash_map > formula_to_bdd_map; + typedef std::unordered_map > formula_to_bdd_map; formula_to_bdd_map f2b_; possible_fair_loop_checker pflc_; @@ -2057,7 +2060,8 @@ namespace spot } typedef std::map prom_map; - typedef Sgi::hash_map dest_map; + typedef std::unordered_map dest_map; static void fill_dests(translate_dict& d, dest_map& dests, bdd label, const formula* dest) diff --git a/src/tgbaalgos/magic.cc b/src/tgbaalgos/magic.cc index ade8fea20..40bec93a5 100644 --- a/src/tgbaalgos/magic.cc +++ b/src/tgbaalgos/magic.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2011 Laboratoire de recherche et développement de +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de recherche et développement de // l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -504,8 +505,8 @@ namespace spot private: - typedef Sgi::hash_map hash_type; + typedef std::unordered_map hash_type; hash_type h; }; diff --git a/src/tgbaalgos/minimize.cc b/src/tgbaalgos/minimize.cc index fa4dad307..4e28e1fd3 100644 --- a/src/tgbaalgos/minimize.cc +++ b/src/tgbaalgos/minimize.cc @@ -52,10 +52,10 @@ namespace spot { - typedef Sgi::hash_set hash_set; - typedef Sgi::hash_map hash_map; + typedef std::unordered_set hash_set; + typedef std::unordered_map hash_map; namespace { diff --git a/src/tgbaalgos/ndfs_result.hxx b/src/tgbaalgos/ndfs_result.hxx index 579cc2e18..bff3c3cc9 100644 --- a/src/tgbaalgos/ndfs_result.hxx +++ b/src/tgbaalgos/ndfs_result.hxx @@ -1,7 +1,8 @@ -// Copyright (C) 2011 Laboratoire de recherche et développement de +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de recherche et développement de // l'Epita (LRDE). // Copyright (C) 2004, 2005, 2006 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -226,8 +227,8 @@ namespace spot }; typedef std::list accepting_transitions_list; - typedef Sgi::hash_set state_set; + typedef std::unordered_set state_set; void clean(stack_type& st1, state_set& seen, state_set& dead) { @@ -457,8 +458,9 @@ namespace spot } } - typedef Sgi::hash_multimap m_source_trans; + typedef std::unordered_multimap m_source_trans; template class min_path: public bfs_steps diff --git a/src/tgbaalgos/powerset.hh b/src/tgbaalgos/powerset.hh index 3c5bdb63c..a0b6831ca 100644 --- a/src/tgbaalgos/powerset.hh +++ b/src/tgbaalgos/powerset.hh @@ -34,8 +34,8 @@ namespace spot { typedef std::set power_state; typedef std::map power_map_data; - typedef Sgi::hash_set state_set; + typedef std::unordered_set state_set; ~power_map() { diff --git a/src/tgbaalgos/randomgraph.cc b/src/tgbaalgos/randomgraph.cc index 6972bd72a..b05807e60 100644 --- a/src/tgbaalgos/randomgraph.cc +++ b/src/tgbaalgos/randomgraph.cc @@ -1,5 +1,5 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2008, 2009, 2010, 2012 Laboratoire de Recherche et +// Copyright (C) 2008, 2009, 2010, 2012, 2013 Laboratoire de Recherche et // Développement de l'Epita (LRDE). // Copyright (C) 2004, 2005, 2007 Laboratoire d'Informatique de // Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), @@ -126,7 +126,7 @@ namespace spot *i &= bdd_exist(allneg, *i); - // Using Sgi::hash_set instead of std::set for these sets is 3 + // Using std::unordered_set instead of std::set for these sets is 3 // times slower (tested on a 50000 nodes example). Use an int // (the index into states[]), not the tgba_explicit::state* // directly, because the later would yield different graphs diff --git a/src/tgbaalgos/reachiter.hh b/src/tgbaalgos/reachiter.hh index bda9ed419..490d0046f 100644 --- a/src/tgbaalgos/reachiter.hh +++ b/src/tgbaalgos/reachiter.hh @@ -91,8 +91,8 @@ namespace spot protected: const tgba* aut_; ///< The spot::tgba to explore. - typedef Sgi::hash_map seen_map; + typedef std::unordered_map seen_map; seen_map seen; ///< States already seen. }; @@ -161,8 +161,8 @@ namespace spot protected: const tgba* aut_; ///< The spot::tgba to explore. - typedef Sgi::hash_map seen_map; + typedef std::unordered_map seen_map; seen_map seen; ///< States already seen. struct stack_item { @@ -197,7 +197,7 @@ namespace spot virtual void push(const state* s, int sn); virtual void pop(); - Sgi::hash_set stack_; + std::unordered_set stack_; }; } diff --git a/src/tgbaalgos/replayrun.cc b/src/tgbaalgos/replayrun.cc index f452825c2..cab0320ee 100644 --- a/src/tgbaalgos/replayrun.cc +++ b/src/tgbaalgos/replayrun.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2011 Laboratoire de Recherche et Développement +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de Recherche et Développement // de l'Epita (LRDE). // Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -52,8 +53,8 @@ namespace spot bdd all_acc = bddfalse; bdd expected_all_acc = a->all_acceptance_conditions(); bool all_acc_seen = false; - typedef Sgi::hash_map, - state_ptr_hash, state_ptr_equal> state_map; + typedef std::unordered_map, + state_ptr_hash, state_ptr_equal> state_map; state_map seen; if (run->prefix.empty()) diff --git a/src/tgbaalgos/safety.cc b/src/tgbaalgos/safety.cc index 2c0f70570..e7f390cf9 100644 --- a/src/tgbaalgos/safety.cc +++ b/src/tgbaalgos/safety.cc @@ -1,5 +1,6 @@ -// Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement de -// l'Epita (LRDE) +// -*- coding: utf-8 -*- +// Copyright (C) 2010, 2011, 2013 Laboratoire de Recherche et +// Développement de l'Epita (LRDE) // // This file is part of Spot, a model checking library. // @@ -71,8 +72,8 @@ namespace spot bool is_safety_mwdba(const tgba* aut) { - typedef Sgi::hash_set seen_map; + typedef std::unordered_set seen_map; seen_map seen; // States already seen. std::deque todo; // A queue of states yet to explore. diff --git a/src/tgbaalgos/scc.hh b/src/tgbaalgos/scc.hh index e1cd52f07..809a1c0a0 100644 --- a/src/tgbaalgos/scc.hh +++ b/src/tgbaalgos/scc.hh @@ -223,8 +223,8 @@ namespace spot // between each of these SCC. std::stack arc_cond_; // A stack of conditions // between each of these SCC. - typedef Sgi::hash_map hash_type; + typedef std::unordered_map hash_type; hash_type h_; // Map of visited states. Values >= 0 // designate maximal SCC. Values < 0 // number states that are part of diff --git a/src/tgbaalgos/se05.cc b/src/tgbaalgos/se05.cc index ce73a04ca..1c6392a2e 100644 --- a/src/tgbaalgos/se05.cc +++ b/src/tgbaalgos/se05.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2011 Laboratoire de Recherche et Developpement de +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de Recherche et Developpement de // l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -436,10 +437,10 @@ namespace spot class explicit_se05_search_heap { - typedef Sgi::hash_set hcyan_type; - typedef Sgi::hash_map hash_type; + typedef std::unordered_set hcyan_type; + typedef std::unordered_map hash_type; public: enum { Safe = 1 }; @@ -572,8 +573,8 @@ namespace spot class bsh_se05_search_heap { private: - typedef Sgi::hash_set hcyan_type; + typedef std::unordered_set hcyan_type; public: enum { Safe = 0 }; diff --git a/src/tgbaalgos/simulation.cc b/src/tgbaalgos/simulation.cc index a938300a7..c2c884d3d 100644 --- a/src/tgbaalgos/simulation.cc +++ b/src/tgbaalgos/simulation.cc @@ -101,13 +101,13 @@ namespace spot // Some useful typedef: // Used to get the signature of the state. - typedef Sgi::hash_map map_state_bdd; + typedef std::unordered_map map_state_bdd; - typedef Sgi::hash_map map_state_unsigned; + typedef std::unordered_map map_state_unsigned; typedef std::map map_state_state; diff --git a/src/tgbaalgos/tau03.cc b/src/tgbaalgos/tau03.cc index 5aa450d44..3be52ccc7 100644 --- a/src/tgbaalgos/tau03.cc +++ b/src/tgbaalgos/tau03.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2011 Laboratoire de Recherche et Developpement de +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de Recherche et Developpement de // l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -368,8 +369,8 @@ namespace spot } private: - typedef Sgi::hash_map, - state_ptr_hash, state_ptr_equal> hash_type; + typedef std::unordered_map, + state_ptr_hash, state_ptr_equal> hash_type; hash_type h; }; diff --git a/src/tgbaalgos/tau03opt.cc b/src/tgbaalgos/tau03opt.cc index 4eac6e0d6..07bf37fb2 100644 --- a/src/tgbaalgos/tau03opt.cc +++ b/src/tgbaalgos/tau03opt.cc @@ -1,7 +1,8 @@ -// Copyright (C) 2011 Laboratoire de Recherche et Developpement de +// -*- coding: utf-8 -*- +// Copyright (C) 2011, 2013 Laboratoire de Recherche et Developpement de // l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -409,10 +410,10 @@ namespace spot class explicit_tau03_opt_search_heap { - typedef Sgi::hash_map, - state_ptr_hash, state_ptr_equal> hcyan_type; - typedef Sgi::hash_map, - state_ptr_hash, state_ptr_equal> hash_type; + typedef std::unordered_map, + state_ptr_hash, state_ptr_equal> hcyan_type; + typedef std::unordered_map, + state_ptr_hash, state_ptr_equal> hash_type; public: class color_ref {