1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-10 22:09:22 -04:00
ports/lang/cjs/files/patch-c++11
Jan Beich cb2f1e01ba lang/cjs: unbreak build with Clang 6 (C++14 by default)
gi/boxed.cpp:552:16: error: cannot initialize return object of type 'GIFieldInfo *' (aka '_GIBaseInfoStub *') with an rvalue of type 'int'
        return JS_FALSE;
               ^~~~~~~~
gi/ns.cpp:188:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
        return JS_FALSE;
               ^~~~~~~~
gi/repo.cpp:312:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
        return JS_FALSE;
               ^~~~~~~~
/usr/local/include/mozjs-24/jstypes.h:194:18: note: expanded from macro 'JS_FALSE'
 #define JS_FALSE (int)0
                  ^~~~~~

Reported by:	antoine (via bug 224669)
2018-01-08 17:07:00 +00:00

46 lines
1.7 KiB
Text

gi/boxed.cpp:552:16: error: cannot initialize return object of type 'GIFieldInfo *' (aka '_GIBaseInfoStub *') with an rvalue of type 'int'
return JS_FALSE;
^~~~~~~~
gi/ns.cpp:188:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
return JS_FALSE;
^~~~~~~~
gi/repo.cpp:312:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
return JS_FALSE;
^~~~~~~~
/usr/local/include/mozjs-24/jstypes.h:194:18: note: expanded from macro 'JS_FALSE'
#define JS_FALSE (int)0
^~~~~~
--- gi/boxed.cpp.orig 2014-11-23 11:02:30 UTC
+++ gi/boxed.cpp
@@ -549,7 +549,7 @@ get_field_info (JSContext *context,
jsval id_val;
if (!JS_IdToValue(context, id, &id_val))
- return JS_FALSE;
+ return NULL;
if (!JSVAL_IS_INT (id_val)) {
gjs_throw(context, "Field index for %s is not an integer",
--- gi/ns.cpp.orig 2014-11-23 11:02:30 UTC
+++ gi/ns.cpp
@@ -185,7 +185,7 @@ ns_new(JSContext *context,
global = gjs_get_import_global(context);
if (!JS_HasProperty(context, global, gjs_ns_class.name, &found))
- return JS_FALSE;
+ return NULL;
if (!found) {
JSObject *prototype;
prototype = JS_InitClass(context, global,
--- gi/repo.cpp.orig 2014-11-23 11:02:30 UTC
+++ gi/repo.cpp
@@ -309,7 +309,7 @@ repo_new(JSContext *context)
repo = JS_NewObject(context, &gjs_repo_class, NULL, global);
if (repo == NULL) {
gjs_throw(context, "No memory to create repo object");
- return JS_FALSE;
+ return NULL;
}
priv = g_slice_new0(Repo);