Fixed problems with sorting css selectors.

tordex · tordex · commit 7ee5c117324d · 2015-10-23T18:02:36.000+03:00
Closes #39
diff --git a/src/css_selector.h b/src/css_selector.h
@@ -244,12 +244,12 @@ namespace litehtml
 		return (v1.m_specificity < v2.m_specificity);
 	}
 
-	inline bool operator > (css_selector::ptr v1, css_selector::ptr v2)
+	inline bool operator >(const css_selector::ptr& v1, const css_selector::ptr& v2)
 	{
 		return (*v1 > *v2);
 	}
 
-	inline bool operator < (css_selector::ptr v1, css_selector::ptr v2)
+	inline bool operator < (const css_selector::ptr& v1, const css_selector::ptr& v2)
 	{
 		return (*v1 < *v2);
 	}
diff --git a/src/stylesheet.cpp b/src/stylesheet.cpp
@@ -126,7 +126,12 @@ bool litehtml::css::parse_selectors( const tstring& txt, const litehtml::style::
 
 void litehtml::css::sort_selectors()
 {
-	sort(m_selectors.begin(), m_selectors.end(), std::less<css_selector::ptr>( ));
+	std::sort(m_selectors.begin(), m_selectors.end(),
+		 [](const css_selector::ptr& v1, const css_selector::ptr& v2)
+		 {
+			 return (*v1) < (*v2);
+		 }
+	);
 }
 
 void litehtml::css::parse_atrule(const tstring& text, const tchar_t* baseurl, const std::shared_ptr<document>& doc, const media_query_list::ptr& media)

Original file line number	Diff line number	Diff line change
`@@ -244,12 +244,12 @@ namespace litehtml`
`244`	`244`	`return (v1.m_specificity < v2.m_specificity);`
`245`	`245`	`}`
`246`	`246`
`247`		`- inline bool operator > (css_selector::ptr v1, css_selector::ptr v2)`
	`247`	`+ inline bool operator >(const css_selector::ptr& v1, const css_selector::ptr& v2)`
`248`	`248`	`{`
`249`	`249`	`return (v1 > v2);`
`250`	`250`	`}`
`251`	`251`
`252`		`- inline bool operator < (css_selector::ptr v1, css_selector::ptr v2)`
	`252`	`+ inline bool operator < (const css_selector::ptr& v1, const css_selector::ptr& v2)`
`253`	`253`	`{`
`254`	`254`	`return (v1 < v2);`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,12 @@ bool litehtml::css::parse_selectors( const tstring& txt, const litehtml::style::`
`126`	`126`
`127`	`127`	`void litehtml::css::sort_selectors()`
`128`	`128`	`{`
`129`		`- sort(m_selectors.begin(), m_selectors.end(), std::less<css_selector::ptr>( ));`
	`129`	`+ std::sort(m_selectors.begin(), m_selectors.end(),`
	`130`	`+ [](const css_selector::ptr& v1, const css_selector::ptr& v2)`
	`131`	`+ {`
	`132`	`+ return (v1) < (v2);`
	`133`	`+ }`
	`134`	`+ );`
`130`	`135`	`}`
`131`	`136`
`132`	`137`	`void litehtml::css::parse_atrule(const tstring& text, const tchar_t* baseurl, const std::shared_ptr<document>& doc, const media_query_list::ptr& media)`