OSDN > Find Software > Text Editors > Alpha > SCM > hg > alpha > Commit

Alpha
Fork

alpha: Commit

diff -r 7afdd7b04c25 -r c1d06d8908ba ascension/ascension/presentation/style-property.hpp

--- a/ascension/ascension/presentation/style-property.hpp Mon Oct 31 01:09:00 2016 +0900

+++ b/ascension/ascension/presentation/style-property.hpp Mon Oct 31 01:16:41 2016 +0900

		@@ -27,7 +27,7 @@
27	27	namespace ascension {
28	28	namespace presentation {
29	29	namespace styles {
30		- template<typename T, int _initialValue> // decltype(_initialValue) should be T...
	30	+ template<typename T, T _initialValue> // decltype(_initialValue) should be T...
31	31	struct Enumerated : public boost::mpl::identity<T> {
32	32	static type initialValue() {return static_cast<type>(_initialValue);}
33	33	};

diff -r 7afdd7b04c25 -r c1d06d8908ba ascension/ascension/presentation/styles/text-decor.hpp

--- a/ascension/ascension/presentation/styles/text-decor.hpp Mon Oct 31 01:09:00 2016 +0900

+++ b/ascension/ascension/presentation/styles/text-decor.hpp Mon Oct 31 01:16:41 2016 +0900

		@@ -231,7 +231,10 @@
231	231	* (http://www.w3.org/TR/css-text-decor-3/#text-emphasis-position-property)
232	232	*/
233	233	typedef StyleProperty<
234		- Enumerated<TextEmphasisPositionEnums, static_cast<int>(TextEmphasisPositionEnums::OVER) \| static_cast<int>(TextEmphasisPositionEnums::RIGHT)>,
	234	+ Enumerated<
	235	+ TextEmphasisPositionEnums,
	236	+ static_cast<TextEmphasisPositionEnums>(static_cast<int>(TextEmphasisPositionEnums::OVER) \| static_cast<int>(TextEmphasisPositionEnums::RIGHT))
	237	+ >,
235	238	Inherited<true>
236	239	> TextEmphasisPosition;
237	240	#if 0