File: 0010-booksdb-avoid-converting-boolean-to-shared_ptr.patch

package info (click to toggle)
fbreader 0.12.10dfsg2-2
  • links: PTS
  • area: main
  • in suites: stretch
  • size: 12,608 kB
  • ctags: 13,435
  • sloc: cpp: 78,853; xml: 15,548; makefile: 845; sh: 305
file content (22 lines) | stat: -rw-r--r-- 835 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
From: "Eugene V. Lyubimkin" <jackyf@debian.org>
Date: Sun, 24 Jul 2016 11:03:52 +0200
Subject: booksdb: avoid converting boolean to shared_ptr

GCC6 doesn't like it.
---
 fbreader/src/database/booksdb/BooksDB.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp
index 3a37640..2bbb37c 100644
--- a/fbreader/src/database/booksdb/BooksDB.cpp
+++ b/fbreader/src/database/booksdb/BooksDB.cpp
@@ -145,7 +145,7 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &fileName) {
 
 	myFindFileId->setFileName(fileName);
 	if (!myFindFileId->run()) {
-		return false;
+		return 0;
 	}
 	((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();
 	shared_ptr<DBDataReader> reader = myLoadBook->executeReader();