Attachment #864586 for bug #909094

View | Details | Raw Unified | Return to bug 909094
Collapse All | Expand All

Lines 201-207 Link Here

(-)a/src/device-manager.cpp (-2 / +2 lines)
201	guint liveButtons;	201	guint liveButtons;
202	};	202	};
203		203
204	class IdMatcher : public std::unary_function<Glib::RefPtr<InputDeviceImpl>&, bool> {	204	class IdMatcher : public std::__unary_function<Glib::RefPtr<InputDeviceImpl>&, bool> {
205	public:	205	public:
206	IdMatcher(Glib::ustring const& target):target(target) {}	206	IdMatcher(Glib::ustring const& target):target(target) {}
207	bool operator ()(Glib::RefPtr<InputDeviceImpl>& dev) {return dev && (target == dev->getId());}	207	bool operator ()(Glib::RefPtr<InputDeviceImpl>& dev) {return dev && (target == dev->getId());}
Lines 210-216 Link Here
210	Glib::ustring const& target;	210	Glib::ustring const& target;
211	};	211	};
212		212
213	class LinkMatcher : public std::unary_function<Glib::RefPtr<InputDeviceImpl>&, bool> {	213	class LinkMatcher : public std::__unary_function<Glib::RefPtr<InputDeviceImpl>&, bool> {
214	public:	214	public:
215	LinkMatcher(Glib::ustring const& target):target(target) {}	215	LinkMatcher(Glib::ustring const& target):target(target) {}
216	bool operator ()(Glib::RefPtr<InputDeviceImpl>& dev) {return dev && (target == dev->getLink());}	216	bool operator ()(Glib::RefPtr<InputDeviceImpl>& dev) {return dev && (target == dev->getLink());}

Lines 46-55 Link Here

(-)a/src/libnrtype/FontFactory.h (-2 / +2 lines)
46		46
47	// the font_factory keeps a hashmap of all the loaded font_instances, and uses the PangoFontDescription	47	// the font_factory keeps a hashmap of all the loaded font_instances, and uses the PangoFontDescription
48	// as index (nota: since pango already does that, using the PangoFont could work too)	48	// as index (nota: since pango already does that, using the PangoFont could work too)
49	struct font_descr_hash : public std::unary_function<PangoFontDescription*,size_t> {	49	struct font_descr_hash : public std::__unary_function<PangoFontDescription*,size_t> {
50	size_t operator()(PangoFontDescription *const &x) const;	50	size_t operator()(PangoFontDescription *const &x) const;
51	};	51	};
52	struct font_descr_equal : public std::binary_function<PangoFontDescription, PangoFontDescription, bool> {	52	struct font_descr_equal : public std::__binary_function<PangoFontDescription, PangoFontDescription, bool> {
53	bool operator()(PangoFontDescription const &a, PangoFontDescription const &b) const;	53	bool operator()(PangoFontDescription const &a, PangoFontDescription const &b) const;
54	};	54	};
55		55

Lines 63-69 Link Here

(-)a/src/ui/dialog/undo-history.h (-1 / +1 lines)
63	class CellRendererInt : public Gtk::CellRendererText {	63	class CellRendererInt : public Gtk::CellRendererText {
64	public:	64	public:
65		65
66	struct Filter : std::unary_function<int, bool> {	66	struct Filter : std::__unary_function<int, bool> {
67	virtual ~Filter() = default;	67	virtual ~Filter() = default;
68	virtual bool operator() (const int&) const =0;	68	virtual bool operator() (const int&) const =0;
69	};	69	};

Lines 38-44 Link Here

(-)a/src/ui/tool/multi-path-manipulator.cpp (-1 / +1 lines)
38	namespace {	38	namespace {
39		39
40	struct hash_nodelist_iterator	40	struct hash_nodelist_iterator
41	: public std::unary_function<NodeList::iterator, std::size_t>	41	: public std::__unary_function<NodeList::iterator, std::size_t>
42	{	42	{
43	std::size_t operator()(NodeList::iterator i) const {	43	std::size_t operator()(NodeList::iterator i) const {
44	return std::hash<NodeList::iterator::pointer>()(&*i);	44	return std::hash<NodeList::iterator::pointer>()(&*i);

Lines 26-32 Link Here

(-)a/src/util/units.h (-1 / +1 lines)
26		26
27	namespace std {	27	namespace std {
28	template <>	28	template <>
29	struct hash<Glib::ustring> : public std::unary_function<Glib::ustring, std::size_t> {	29	struct hash<Glib::ustring> : public std::__unary_function<Glib::ustring, std::size_t> {
30	std::size_t operator()(Glib::ustring const &s) const {	30	std::size_t operator()(Glib::ustring const &s) const {
31	return hash<std::string>()(s.raw());	31	return hash<std::string>()(s.raw());
32	}	32	}

Return to bug 909094