[all] fix unsplicing reader conditionals due to breaking change in CL…

…J1.7-RC1
thi-ng · Jun 1, 2015 · 55ce0dd · 55ce0dd
1 parent b6185e6
commit 55ce0dd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/geom-core/src/matrix.org b/geom-core/src/matrix.org
@@ -784,9 +784,8 @@ ordering (row major).
 ** Override print methods
 
 #+BEGIN_SRC clojure :noweb-ref printers
-  #?@(:clj
-      [(defmethod print-method Matrix32 [^Matrix32 o ^java.io.Writer w] (.write w (.toString o)))
-       (defmethod print-method Matrix44 [^Matrix44 o ^java.io.Writer w] (.write w (.toString o)))])
+  #?(:clj (defmethod print-method Matrix32 [^Matrix32 o ^java.io.Writer w] (.write w (.toString o))))
+  #?(:clj (defmethod print-method Matrix44 [^Matrix44 o ^java.io.Writer w] (.write w (.toString o))))
 #+END_SRC
 
 ** Constants

diff --git a/geom-svg/src/core.org b/geom-svg/src/core.org
@@ -73,12 +73,13 @@ libraries available and we don't want to be prescriptive here and
 introduce uneccessary dependencies.
 
 #+BEGIN_SRC clojure :noweb-ref svg
-  #?@(:clj
-      [(defn serialize
-         ^String [svg] (str xml-preamble (html {:mode :xml} svg)))
+  #?(:clj
+     (defn serialize
+       ^String [svg] (str xml-preamble (html {:mode :xml} svg))))
 
-       (defn serialize-as-byte-array
-         ^bytes [svg] (.getBytes (serialize svg) "UTF-8"))])
+  #?(:clj
+     (defn serialize-as-byte-array
+       ^bytes [svg] (.getBytes (serialize svg) "UTF-8")))
 #+END_SRC
 
 ** Attribute conversion

diff --git a/geom-types/src/spatialtree.org b/geom-types/src/spatialtree.org
@@ -325,10 +325,13 @@
 *** Override print methods
 
 #+BEGIN_SRC clojure :noweb-ref impl
-  #?@(:clj
-      [(require 'clojure.pprint)
-       (defmethod print-method MutableQuadtreeNode [^MutableQuadtreeNode o ^java.io.Writer w] (.write w (.toString o)))
-       (defmethod print-method MutableOctreeNode [^MutableOctreeNode o ^java.io.Writer w] (.write w (.toString o)))])
+  #?(:clj
+     (do
+       (require 'clojure.pprint)
+       (defmethod print-method MutableQuadtreeNode
+         [^MutableQuadtreeNode o ^java.io.Writer w] (.write w (.toString o)))
+       (defmethod print-method MutableOctreeNode
+         [^MutableOctreeNode o ^java.io.Writer w] (.write w (.toString o)))))
 #+END_SRC
 
 ** Constructors