[gjs/fix-windows: 1/2] gi/arg.h: Prefix IN/OUT enum entries with ARG_
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/fix-windows: 1/2] gi/arg.h: Prefix IN/OUT enum entries with ARG_
- Date: Wed, 12 Jan 2022 05:48:35 +0000 (UTC)
commit 73fb4f35723ef8ea47a3fadaf8d7a16c071c9aa7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jan 12 12:25:00 2022 +0800
gi/arg.h: Prefix IN/OUT enum entries with ARG_
Unfortunately, IN/OUT are considered to be reserved words when building with
Windows SDK headers, so prefix them with ARG_ so that we don't get into naming
clashes.
gi/arg-cache.h | 4 ++--
gi/arg.cpp | 6 +++---
gi/arg.h | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gi/arg-cache.h b/gi/arg-cache.h
index 94410aac..2a02869b 100644
--- a/gi/arg-cache.h
+++ b/gi/arg-cache.h
@@ -72,11 +72,11 @@ struct Argument {
if (m_skip_in)
flags |= GjsArgumentFlags::SKIP_IN;
else
- flags |= GjsArgumentFlags::IN;
+ flags |= GjsArgumentFlags::ARG_IN;
if (m_skip_out)
flags |= GjsArgumentFlags::SKIP_OUT;
else
- flags |= GjsArgumentFlags::OUT;
+ flags |= GjsArgumentFlags::ARG_OUT;
return flags;
}
diff --git a/gi/arg.cpp b/gi/arg.cpp
index 5d3500f3..99446bf7 100644
--- a/gi/arg.cpp
+++ b/gi/arg.cpp
@@ -2870,7 +2870,7 @@ gjs_ghr_helper(gpointer key, gpointer val, gpointer user_data) {
*/
constexpr static bool is_transfer_in_nothing(GITransfer transfer,
GjsArgumentFlags flags) {
- return (transfer == GI_TRANSFER_NOTHING) && (flags & GjsArgumentFlags::IN);
+ return (transfer == GI_TRANSFER_NOTHING) && (flags & GjsArgumentFlags::ARG_IN);
}
GJS_JSAPI_RETURN_CONVENTION
@@ -3315,7 +3315,7 @@ bool gjs_g_argument_release_in_array(JSContext* context, GITransfer transfer,
gjs_arg_set(&elem, array[i]);
if (!gjs_g_arg_release_internal(context, GI_TRANSFER_NOTHING,
param_type, type_tag,
- GjsArgumentFlags::IN, &elem)) {
+ GjsArgumentFlags::ARG_IN, &elem)) {
return false;
}
}
@@ -3348,7 +3348,7 @@ bool gjs_g_argument_release_out_array(JSContext* context, GITransfer transfer,
JS::AutoSaveExceptionState saved_exc(context);
if (!gjs_g_arg_release_internal(context, GI_TRANSFER_EVERYTHING,
param_type, type_tag,
- GjsArgumentFlags::OUT, &elem)) {
+ GjsArgumentFlags::ARG_OUT, &elem)) {
return false;
}
}
diff --git a/gi/arg.h b/gi/arg.h
index f5acd3e4..c1ac6955 100644
--- a/gi/arg.h
+++ b/gi/arg.h
@@ -36,9 +36,9 @@ enum class GjsArgumentFlags : uint8_t {
SKIP_IN = 1 << 2,
SKIP_OUT = 1 << 3,
SKIP_ALL = SKIP_IN | SKIP_OUT,
- IN = 1 << 4,
- OUT = 1 << 5,
- INOUT = IN | OUT,
+ ARG_IN = 1 << 4,
+ ARG_OUT = 1 << 5,
+ ARG_INOUT = ARG_IN | ARG_OUT,
};
[[nodiscard]] char* gjs_argument_display_name(const char* arg_name,
@@ -112,7 +112,7 @@ inline bool gjs_g_argument_release_in_arg(JSContext* cx, GITransfer transfer,
GITypeInfo* type_info,
GIArgument* arg) {
return gjs_g_argument_release_in_arg(cx, transfer, type_info,
- GjsArgumentFlags::IN, arg);
+ GjsArgumentFlags::ARG_IN, arg);
}
GJS_JSAPI_RETURN_CONVENTION
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]