works with clojure branch new by excluding deftype

Signed-off-by: Rich Hickey <richhickey@gmail.com>

9 files changed, 9 insertions, 0 deletions

diff --git a/src/clojure/contrib/accumulators.clj b/src/clojure/contrib/accumulators.clj
index 17414b0e..dcd03dd1 100644
--- a/src/clojure/contrib/accumulators.clj
+++ b/src/clojure/contrib/accumulators.clj
@@ -23,6 +23,7 @@
      :doc "A generic accumulator interface and implementations of various
            accumulators."}
   clojure.contrib.accumulators
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.types :only (deftype)])
   (:use [clojure.contrib.def :only (defvar defvar- defmacro-)])
   (:require [clojure.contrib.generic.arithmetic :as ga]))
diff --git a/src/clojure/contrib/complex_numbers.clj b/src/clojure/contrib/complex_numbers.clj
index 48f34bcf..01f90b9c 100644
--- a/src/clojure/contrib/complex_numbers.clj
+++ b/src/clojure/contrib/complex_numbers.clj
@@ -17,6 +17,7 @@
            NOTE: This library is in evolution. Most math functions are
                  not implemented yet."}
   clojure.contrib.complex-numbers
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.types :only (deftype)]
 	[clojure.contrib.generic :only (root-type)])
   (:require [clojure.contrib.generic.arithmetic :as ga]
diff --git a/src/clojure/contrib/pprint/PrettyWriter.clj b/src/clojure/contrib/pprint/PrettyWriter.clj
index 61e0c9ad..92b381a0 100644
--- a/src/clojure/contrib/pprint/PrettyWriter.clj
+++ b/src/clojure/contrib/pprint/PrettyWriter.clj
@@ -15,6 +15,7 @@
 ;; core of the XP algorithm.
 
 (ns clojure.contrib.pprint.PrettyWriter
+  (:refer-clojure :exclude (deftype))
   (:use clojure.contrib.pprint.utilities)
   (:gen-class
    :extends clojure.contrib.pprint.ColumnWriter
diff --git a/src/clojure/contrib/probabilities/monte_carlo.clj b/src/clojure/contrib/probabilities/monte_carlo.clj
index 6e140a48..e3bc0f7e 100644
--- a/src/clojure/contrib/probabilities/monte_carlo.clj
+++ b/src/clojure/contrib/probabilities/monte_carlo.clj
@@ -31,6 +31,7 @@
            stream. Such functions are state monad values and can be
            composed using operations defined in clojure.contrib.monads."}
   clojure.contrib.probabilities.monte-carlo
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.macros :only (const)])
   (:use [clojure.contrib.types :only (deftype)])
   (:use [clojure.contrib.stream-utils :only (defstream stream-next)])
diff --git a/src/clojure/contrib/probabilities/random_numbers.clj b/src/clojure/contrib/probabilities/random_numbers.clj
index bf6372f0..bc21769b 100644
--- a/src/clojure/contrib/probabilities/random_numbers.clj
+++ b/src/clojure/contrib/probabilities/random_numbers.clj
@@ -24,6 +24,7 @@
            At the moment, the only generator provided is a rather simple
            linear congruential generator."}
   clojure.contrib.probabilities.random-numbers
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.types :only (deftype)])
   (:use [clojure.contrib.stream-utils :only (defstream)])
   (:use [clojure.contrib.def :only (defvar)]))
diff --git a/src/clojure/contrib/stream_utils.clj b/src/clojure/contrib/stream_utils.clj
index 4533f384..35c5c90e 100644
--- a/src/clojure/contrib/stream_utils.clj
+++ b/src/clojure/contrib/stream_utils.clj
@@ -55,6 +55,7 @@
            the next value of stream argument s, whereas pick-all returns the
            next value of all stream arguments in the form of a vector."}
   clojure.contrib.stream-utils
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.types :only (deftype deftype-)])
   (:use [clojure.contrib.monads :only (defmonad with-monad)])
   (:use [clojure.contrib.def :only (defvar defvar-)])
diff --git a/src/clojure/contrib/stream_utils/examples.clj b/src/clojure/contrib/stream_utils/examples.clj
index 018d63c8..524423bb 100644
--- a/src/clojure/contrib/stream_utils/examples.clj
+++ b/src/clojure/contrib/stream_utils/examples.clj
@@ -11,6 +11,7 @@
      :skip-wiki true
      :doc "Examples for data streams"}
   clojure.contrib.stream-utils.examples
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.stream-utils
 	 :only (defst stream-next
 		pick pick-all
diff --git a/src/clojure/contrib/types.clj b/src/clojure/contrib/types.clj
index b3c2bcbe..00bd220d 100644
--- a/src/clojure/contrib/types.clj
+++ b/src/clojure/contrib/types.clj
@@ -15,6 +15,7 @@
   #^{:author "Konrad Hinsen"
      :doc "General and algebraic data types"}
   clojure.contrib.types
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.def :only (name-with-attributes)]))
 
 ;
diff --git a/src/clojure/contrib/types/examples.clj b/src/clojure/contrib/types/examples.clj
index de2a9137..486f8ce6 100644
--- a/src/clojure/contrib/types/examples.clj
+++ b/src/clojure/contrib/types/examples.clj
@@ -11,6 +11,7 @@
      :skip-wiki true
      :doc "Examples for data type definitions"}
   clojure.contrib.types.examples
+  (:refer-clojure :exclude (deftype))
   (:use [clojure.contrib.types
 	 :only (deftype defadt match)])
   (:require [clojure.contrib.generic.collection :as gc])