a48f02e0da
Phew, a lot of classes were affected by this. The rationale for the
changes are as follows:
- When a type X declares any constructor, the default constructor is
not declared, so there is no need for X() = delete there. In fact,
there is brutal difference between those two: deleted members
participate in overload resolution, but not-declared members do not!
- When a type X wants to be non-copyable (e.g. to be only movable, like
threads, unique_ptrs, and so on), you can either do it by inheriting
from boost::noncopyable (the old way), or better declare both (!) the
copy constructor _and_ the copy assignment operator as deleted:
X(X const&) = delete;
X& operator=(X const&) = delete;
We had tons of types with deleted copy constructors that were lacking
a corresponding deleted copy assignment operator, making them still
copyable and you wouldn't even notice (read: scary)!
References:
- http://accu.org/content/conf2014/Howard_Hinnant_Accu_2014.pdf
- http://www.boost.org/doc/libs/master/libs/core/doc/html/core/noncopyable.html
Note: I know, I'm quoting Hinnant's extraordinary slides a lot, but
getting the sematic right here is so incredibly important.
59 lines
1.6 KiB
C++
59 lines
1.6 KiB
C++
#ifndef EXTRACTOR_CALLBACKS_HPP
|
|
#define EXTRACTOR_CALLBACKS_HPP
|
|
|
|
#include "util/typedefs.hpp"
|
|
#include <boost/optional/optional_fwd.hpp>
|
|
|
|
#include <string>
|
|
#include <unordered_map>
|
|
|
|
namespace osmium
|
|
{
|
|
class Node;
|
|
class Way;
|
|
}
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
|
|
class ExtractionContainers;
|
|
struct InputRestrictionContainer;
|
|
struct ExtractionNode;
|
|
struct ExtractionWay;
|
|
|
|
/**
|
|
* This class is uses by the extractor with the results of the
|
|
* osmium based parsing and the customization through the lua profile.
|
|
*
|
|
* It mediates between the multi-threaded extraction process and the external memory containers.
|
|
* Thus the synchronization is handled inside of the extractor.
|
|
*/
|
|
class ExtractorCallbacks
|
|
{
|
|
private:
|
|
// used to deduplicate street names: actually maps to name ids
|
|
std::unordered_map<std::string, NodeID> string_map;
|
|
ExtractionContainers &external_memory;
|
|
|
|
public:
|
|
explicit ExtractorCallbacks(ExtractionContainers &extraction_containers);
|
|
|
|
ExtractorCallbacks(const ExtractorCallbacks &) = delete;
|
|
ExtractorCallbacks &operator=(const ExtractorCallbacks &) = delete;
|
|
|
|
// warning: caller needs to take care of synchronization!
|
|
void ProcessNode(const osmium::Node ¤t_node, const ExtractionNode &result_node);
|
|
|
|
// warning: caller needs to take care of synchronization!
|
|
void ProcessRestriction(const boost::optional<InputRestrictionContainer> &restriction);
|
|
|
|
// warning: caller needs to take care of synchronization!
|
|
void ProcessWay(const osmium::Way ¤t_way, const ExtractionWay &result_way);
|
|
};
|
|
}
|
|
}
|
|
|
|
#endif /* EXTRACTOR_CALLBACKS_HPP */
|