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

Alpha
Fork

alpha: Commit

fixed: Some minor compile errors.

diff -r b2dedf4fdcd4 -r e8b05f243b09 ascension/ascension/presentation/flow-relative-four-sides.hpp

--- a/ascension/ascension/presentation/flow-relative-four-sides.hpp Sat Nov 05 10:48:20 2016 +0900

+++ b/ascension/ascension/presentation/flow-relative-four-sides.hpp Sat Nov 05 23:24:07 2016 +0900

		@@ -204,6 +204,14 @@
204	204	FlowRelativeFourSides(const U& other, typename std::enable_if<std::is_convertible<U, T>::value>::type* = nullptr)
205	205	#endif
206	206	: FlowRelativeFourSidesBase<T>((_blockStart = other, _blockEnd = other, _inlineStart = other, _inlineEnd = other)) {}
	207	+ /// Copy-assignment operator.
	208	+ FlowRelativeFourSides& operator=(const FlowRelativeFourSides<T>& other) {
	209	+ blockStart() = other.blockStart();
	210	+ blockEnd() = other.blockEnd();
	211	+ inlineStart() = other.inlineStart();
	212	+ inlineEnd() = other.inlineEnd();
	213	+ return *this;
	214	+ }
207	215	/// Compound-add operator calls same operators of @c T for the all elements.
208	216	FlowRelativeFourSides& operator+=(const FlowRelativeTwoAxes<T>& other) {
209	217	this->blockStart() += other.bpd();

diff -r b2dedf4fdcd4 -r e8b05f243b09 ascension/src/graphics/font/text-layout-uniscribe.cpp

--- a/ascension/src/graphics/font/text-layout-uniscribe.cpp Sat Nov 05 10:48:20 2016 +0900

+++ b/ascension/src/graphics/font/text-layout-uniscribe.cpp Sat Nov 05 23:24:07 2016 +0900

		@@ -2700,7 +2700,7 @@
2700	2700	} // namespace @0
2701	2701
2702	2702	namespace {
2703		- inline AffineTransform&& fontRotationForWritingMode(presentation::BlockFlowDirection blockFlowDirection) {
	2703	+ inline AffineTransform fontRotationForWritingMode(presentation::BlockFlowDirection blockFlowDirection) {
2704	2704	switch(blockFlowDirection) {
2705	2705	case presentation::HORIZONTAL_TB:
2706	2706	return AffineTransform();

diff -r b2dedf4fdcd4 -r e8b05f243b09 ascension/src/presentation/presentation.cpp

--- a/ascension/src/presentation/presentation.cpp Sat Nov 05 10:48:20 2016 +0900

+++ b/ascension/src/presentation/presentation.cpp Sat Nov 05 23:24:07 2016 +0900

		@@ -224,7 +224,7 @@
224	224	}
225	225	const CascadedValues& cascadedValues;
226	226	const ParentComputedValues& parentComputedValues;
227		- mutable SpecifiedValues& specifiedValues; // mutable because of boost.fusion.for_each
	227	+ SpecifiedValues& specifiedValues; // mutable because of boost.fusion.for_each
228	228	private:
229	229	template<typename Property, typename SpecifiedValue, typename P>
230	230	void handle(boost::fusion::pair<Property, SpecifiedValue>& p,

diff -r b2dedf4fdcd4 -r e8b05f243b09 ascension/src/rules/lexical-partition-presentation-reconstructor.cpp

--- a/ascension/src/rules/lexical-partition-presentation-reconstructor.cpp Sat Nov 05 10:48:20 2016 +0900

+++ b/ascension/src/rules/lexical-partition-presentation-reconstructor.cpp Sat Nov 05 23:24:07 2016 +0900

		@@ -98,9 +98,7 @@
98	98
99	99	/// @see StyledTextRunIterator#position
100	100	kernel::Position StyledTextRunIteratorImpl::position() const BOOST_NOEXCEPT {
101		- if(isDone())
102		- throw NoSuchElementException();
103		- return position_;
	101	+ return !isDone() ? position_ : *boost::const_end(region_);
104	102	}
105	103
106	104	/// @see StyledTextRunIterator#style