Attachment 203549 Details for Bug 236616 – Use type_traits to unbreak runtime issues

[patch] Use type_traits to unbreak runtime issues

vbox.diff (text/plain), 2.44 KB, created by Jung-uk Kim on 2019-04-10 01:19:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2019-04-10 01:19:49 UTC

Size: 2.44 KB

patch

obsolete

>Index: emulators/virtualbox-ose/Makefile
>===================================================================
>--- emulators/virtualbox-ose/Makefile	(revision 498510)
>+++ emulators/virtualbox-ose/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.26
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	emulators
> MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
> DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
>Index: emulators/virtualbox-ose/files/patch-include_VBox_com_array.h
>===================================================================
>--- emulators/virtualbox-ose/files/patch-include_VBox_com_array.h	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-include_VBox_com_array.h	(working copy)
>@@ -0,0 +1,36 @@
>+--- include/VBox/com/array.h.orig	2019-01-25 18:24:04 UTC
>++++ include/VBox/com/array.h
>+@@ -168,7 +168,7 @@
>+ 
>+ #include "VBox/com/defs.h"
>+ 
>+-#if RT_GNUC_PREREQ(4, 6) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
>++#if RT_GNUC_PREREQ(4, 6) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) || defined(_LIBCPP_VERSION)
>+ /** @def VBOX_WITH_TYPE_TRAITS
>+  * Type traits are a C++ 11 feature, so not available everywhere (yet).
>+  * Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.
>+@@ -940,12 +940,12 @@ class SafeArray : public Traits (public)
>+      */
>+     T &operator[] (size_t aIdx)
>+     {
>+-        AssertReturn(m.arr != NULL,  *((T *)NULL));
>+-        AssertReturn(aIdx < size(), *((T *)NULL));
>++        AssertReturn(m.arr != NULL,  *((T *)1));
>++        AssertReturn(aIdx < size(), *((T *)1));
>+ #ifdef VBOX_WITH_XPCOM
>+         return m.arr[aIdx];
>+ #else
>+-        AssertReturn(m.raw != NULL,  *((T *)NULL));
>++        AssertReturn(m.raw != NULL,  *((T *)1));
>+         return m.raw[aIdx];
>+ #endif
>+     }
>+@@ -960,7 +960,7 @@ class SafeArray : public Traits (public)
>+ #ifdef VBOX_WITH_XPCOM
>+         return m.arr[aIdx];
>+ #else
>+-        AssertReturn(m.raw != NULL,  *((T *)NULL));
>++        AssertReturn(m.raw != NULL,  *((T *)1));
>+         return m.raw[aIdx];
>+ #endif
>+     }
>
>Property changes on: emulators/virtualbox-ose/files/patch-include_VBox_com_array.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 236616: 203549