- typedef std::set<struct layer> storage_type;
- typedef std::vector<unsigned int> layers_type;
- typedef std::vector<std::pair<std::string, int>> role_to_layer_map;
- typedef std::map<unsigned, unsigned> addsurf_layer_map;
+ using storage_type = std::map<int, struct layer>;
+ using layers_type = std::vector<uint32_t>;
+ using role_to_layer_map = std::vector<std::pair<std::string, int>>;
+ using addsurf_layer_map = std::map<int, int>;