forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-db/firebird: Fix building with GCC-6
Closes: https://bugs.gentoo.org/608294 Closes: gentoo#5212 Package-Manager: Portage-2.3.6, Repoman-2.3.2
- Loading branch information
1 parent
c59e381
commit e82963f
Showing
2 changed files
with
39 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
Bug: https://bugs.gentoo.org/608294 | ||
PR: https://github.com/FirebirdSQL/firebird/pull/104 | ||
|
||
--- a/src/common/classes/alloc.h | ||
+++ b/src/common/classes/alloc.h | ||
@@ -498,10 +498,14 @@ using Firebird::MemoryPool; | ||
|
||
inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; } | ||
|
||
+#if (( ! __GNUC__ ) || ( __GNUC__ < 6 )) | ||
+ | ||
// Global versions of operators new and delete | ||
void* operator new(size_t s) THROW_BAD_ALLOC; | ||
void* operator new[](size_t s) THROW_BAD_ALLOC; | ||
|
||
+#endif | ||
+ | ||
void operator delete(void* mem) throw(); | ||
void operator delete[](void* mem) throw(); | ||
|
||
--- a/src/dudley/exe.epp | ||
+++ b/src/dudley/exe.epp | ||
@@ -2884,9 +2884,9 @@ static USHORT get_prot_mask( const TEXT * relation, TEXT * field) | ||
blr_parameter, 0, 0, 0, | ||
blr_parameter, 0, 1, 0, | ||
blr_parameter, 1, 0, 0, | ||
- blr_end, | ||
- blr_end, | ||
- blr_end, | ||
+ static_cast<SCHAR>(blr_end), | ||
+ static_cast<SCHAR>(blr_end), | ||
+ static_cast<SCHAR>(blr_end), | ||
blr_eoc | ||
}; | ||
static FB_API_HANDLE req_handle; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters