rpm/kshisen
SHA256
1
0
Fork 0
forked from pool/kshisen
Code Pull Requests Activity

Accepting request 443657 from home:wolfi323:branches:KDE:Applications

Browse Source 
- Re-add cpp14.patch, it still fails to build with gcc 4.8
- Cleanup build requirements, same as https://build.opensuse.org/package/rdiff/KDE:Applications/kshisen?linkrev=base&rev=33

OBS-URL: https://build.opensuse.org/request/show/443657
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kshisen?expand=0&rev=41
This commit is contained in:
Luca Beltrame
2016-12-03 22:56:48 +00:00
committed by Git OBS Bridge
parent a738ad5e2a
commit 66c15059da
3 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cpp14.patch Normal file
View File

@@ -0,0 +1,25 @@
Index: kshisen-16.08.2/src/board.cpp
===================================================================
--- kshisen-16.08.2.orig/src/board.cpp
+++ kshisen-16.08.2/src/board.cpp
@@ -1401,9 +1401,9 @@ void Board::madeMove(TilePos const & til
{
std::unique_ptr<Move> move;
if (slide.empty()) {
- move = std::make_unique<Move>(tilePos1, tilePos2, field(tilePos1), field(tilePos2));
+ move = std::unique_ptr<Move>(new Move(tilePos1, tilePos2, field(tilePos1), field(tilePos2)));
} else {
- move = std::make_unique<Move>(tilePos1, tilePos2, field(tilePos1), field(tilePos2), slide);
+ move = std::unique_ptr<Move>(new Move(tilePos1, tilePos2, field(tilePos1), field(tilePos2), slide));
}
m_undo.push_back(std::move(move));
if (!m_redo.empty()) {
@@ -1743,7 +1743,7 @@ bool Board::hint_I(PossibleMoves & possi
int Board::tilesLeft() const
{
- return std::count_if(m_field.begin(), m_field.end(), [](auto field) { return field != EMPTY; });
+ return std::count_if(m_field.begin(), m_field.end(), [](int field) { return field != EMPTY; });
}
int Board::currentTime() const