From f3b54465b6ea8e2094be50c0eb9cfbcd21127410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 12 Jun 2019 11:17:36 +0200
Subject: [PATCH] Pike: Move DestructImmediate to the Pike module.
---
lib/modules/Pike.pmod/module.pmod | 4 ++++
src/builtin.cmod | 27 ++++++++++++++-------------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/lib/modules/Pike.pmod/module.pmod b/lib/modules/Pike.pmod/module.pmod
index 46a8695973..5e5a7339b5 100644
--- a/lib/modules/Pike.pmod/module.pmod
+++ b/lib/modules/Pike.pmod/module.pmod
@@ -32,6 +32,10 @@ constant OPEN_BOUND = __builtin.OPEN_BOUND;
//! irrelevant in this case.
//! @enddl
+#if constant(__builtin.DestructImmediate)
+constant DestructImmediate = __builtin.DestructImmediate;
+#endif
+
constant BacktraceFrame = __builtin.backtrace_frame;
#if constant(__builtin.FakeObject)
diff --git a/src/builtin.cmod b/src/builtin.cmod
index eb9bfdd12c..3033f1ac49 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -2436,6 +2436,20 @@ PIKEFUN void _disassemble(function fun)
/*! @module Pike
*/
+/*! @class DestructImmediate
+ *!
+ *! An empty class that can be inherited to get the
+ *! @tt{PROGRAM_DESTRUCT_IMMEDIATE@} flag set.
+ */
+
+PIKECLASS DestructImmediate
+ program_flags PROGRAM_DESTRUCT_IMMEDIATE;
+{
+}
+
+/*! @endclass
+ */
+
/*! @class FakeObject
*!
*! Used as a place holder in eg backtraces for objects that
@@ -4581,19 +4595,6 @@ PIKECLASS Null
}
}
-/*! @endclass
- */
-
-/*! @class DestructImmediate
- *! An empty class that can be intherited to get the PROGRAM_DESTRUCT_IMMEDIATE
- *! flag set.
- */
-
-PIKECLASS DestructImmediate
- program_flags PROGRAM_DESTRUCT_IMMEDIATE;
-{
-}
-
/*! @endclass
*/
--
GitLab