From df29b16d718de4227b44453e11f6bb25e7a6284c Mon Sep 17 00:00:00 2001 From: Kristin Rutenkolk Date: Fri, 11 Oct 2024 15:17:54 +0200 Subject: [PATCH] remove namespace qualifiers from with-c-layout --- src/clj/coffi/mem.clj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/clj/coffi/mem.clj b/src/clj/coffi/mem.clj index 33b91f6..5d2f98c 100644 --- a/src/clj/coffi/mem.clj +++ b/src/clj/coffi/mem.clj @@ -1558,19 +1558,19 @@ fields (nth struct-spec 1)] (if (seq fields) (let [[[_ type :as field] & fields] fields - size (mem/size-of type) - align (mem/align-of type) + size (size-of type) + align (align-of type) r (rem offset align)] (recur (cond-> (+ offset size) (pos? r) (+ (- align r))) (cond-> aligned-fields - (pos? r) (conj [::padding [::mem/padding (- align r)]]) + (pos? r) (conj [::padding [::padding (- align r)]]) :always (conj field)) fields)) - (let [strongest-alignment (reduce max (map (comp mem/align-of second) (nth struct-spec 1))) + (let [strongest-alignment (reduce max (map (comp align-of second) (nth struct-spec 1))) r (rem offset strongest-alignment)] (cond-> aligned-fields - (pos? r) (conj [::padding [::mem/padding (- strongest-alignment r)]])))))] + (pos? r) (conj [::padding [::padding (- strongest-alignment r)]])))))] (assoc struct-spec 1 aligned-fields))) (defn- typename->coffi-typename [_type]