From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Thu, 1 May 2008 17:50:10 +0000 (+0100)
Subject: && -> & etc.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ee05cb5900b3001ece52d6bd896a07a07dad4ff6;p=virt-df.git

&& -> & etc.
---

diff --git a/lib/int63.mli b/lib/int63.mli
index c2397fd..6ba9270 100644
--- a/lib/int63.mli
+++ b/lib/int63.mli
@@ -85,11 +85,11 @@ module Operators : sig
 	in a row because that clashes with the symbols used for
 	camlp4 quotations. *)
 
-  val ( &&^ ) : t -> t -> t
-  val ( ||^ ) : t -> t -> t
-  val ( ^^^ ) : t -> t -> t
+  val ( &^ ) : t -> t -> t
+  val ( |^ ) : t -> t -> t
+  val ( ^^ ) : t -> t -> t
     (** Infix logical and, or and xor operators.
-	eg. [bits &&^ mask] *)
+	eg. [bits &^ mask] *)
 
   val ( ~^ ) : int -> t
     (** Small integer constants,
diff --git a/lib/int63_on_32.ml b/lib/int63_on_32.ml
index 0b23d49..c57a4ed 100644
--- a/lib/int63_on_32.ml
+++ b/lib/int63_on_32.ml
@@ -35,9 +35,9 @@ module Operators = struct
   external ( %^ ) : int64 -> int64 -> int64 = "%int64_mod"
   external ( <^< ) : int64 -> int -> int64 = "%int64_lsl"
   external ( >^> ) : int64 -> int -> int64 = "%int64_lsr"
-  external ( &&^ ) : int64 -> int64 -> int64 = "%int64_and"
-  external ( ||^ ) : int64 -> int64 -> int64 = "%int64_or"
-  external ( ^^^ ) : int64 -> int64 -> int64 = "%int64_xor"
+  external ( &^ ) : int64 -> int64 -> int64 = "%int64_and"
+  external ( |^ ) : int64 -> int64 -> int64 = "%int64_or"
+  external ( ^^ ) : int64 -> int64 -> int64 = "%int64_xor"
   external ( ~^ ) : int -> int64 = "%int64_of_int"
   let ( ~^~ ) i = Int64.neg (Int64.of_int i)
 end
diff --git a/lib/int63_on_64.ml b/lib/int63_on_64.ml
index a1c9487..c3c4073 100644
--- a/lib/int63_on_64.ml
+++ b/lib/int63_on_64.ml
@@ -31,9 +31,9 @@ module Operators = struct
   external ( %^ ) : int -> int -> int = "%modint"
   external ( <^< ) : int -> int -> int = "%lslint"
   external ( >^> ) : int -> int -> int = "%lsrint"
-  external ( &&^ ) : int -> int -> int = "%andint"
-  external ( ||^ ) : int -> int -> int = "%orint"
-  external ( ^^^ ) : int -> int -> int = "%xorint"
+  external ( &^ ) : int -> int -> int = "%andint"
+  external ( |^ ) : int -> int -> int = "%orint"
+  external ( ^^ ) : int -> int -> int = "%xorint"
   external ( ~^ ) : int -> int = "%identity"
   external ( ~^~ ) : int -> int = "%negint"
 end