--- a/src/OPERATORS/op-ui64-ui64.cc	Wed Sep 01 00:49:06 2004 +0000
+++ b/src/OPERATORS/op-ui64-ui64.cc	Wed Sep 01 21:10:28 2004 +0000
@@ -31,7 +31,18 @@
 #include "gripes.h"
 #include "oct-obj.h"
 #include "ov.h"
+#include "ov-int16.h"
+#include "ov-int32.h"
+#include "ov-int64.h"
+#include "ov-int8.h"
+#include "ov-uint16.h"
+#include "ov-uint32.h"
 #include "ov-uint64.h"
+#include "ov-uint8.h"
+#include "ov-scalar.h"
+#include "ov-complex.h"
+#include "ov-re-mat.h"
+#include "ov-cx-mat.h"
 #include "ov-typeinfo.h"
 #include "ops.h"
 #include "xdiv.h"
@@ -40,37 +51,79 @@
 #include "op-int.h"
 
 OCTAVE_S_INT_UNOPS (uint64)
-OCTAVE_SS_INT_CMP_OPS (uint64, uint64)
-OCTAVE_SS_INT_BOOL_OPS (uint64, uint64)
+OCTAVE_SS_INT_CMP_OPS (ss, uint64_, uint64_)
+OCTAVE_SS_INT_BOOL_OPS (ss, uint64_, uint64_)
+
+OCTAVE_SM_INT_CMP_OPS (sm, uint64_, uint64_)
+OCTAVE_SM_INT_BOOL_OPS (sm, uint64_, uint64_)
 
-OCTAVE_SM_INT_CMP_OPS (uint64, uint64)
-OCTAVE_SM_INT_BOOL_OPS (uint64, uint64)
-
-OCTAVE_MS_INT_CMP_OPS (uint64, uint64)
-OCTAVE_MS_INT_BOOL_OPS (uint64, uint64)
+OCTAVE_MS_INT_CMP_OPS (ms, uint64_, uint64_)
+OCTAVE_MS_INT_BOOL_OPS (ms, uint64_, uint64_)
+OCTAVE_MS_INT_ASSIGN_OPS (ms, uint64_, uint64_, uint64_)
+OCTAVE_MS_INT_ASSIGN_OPS (mx, uint64_, , )
+OCTAVE_MS_INT_ASSIGN_OPS (mc, uint64_, complex_, )
 
 OCTAVE_M_INT_UNOPS (uint64)
 OCTAVE_MM_INT_CMP_OPS (uint64, uint64)
 OCTAVE_MM_INT_BOOL_OPS (uint64, uint64)
-OCTAVE_MM_INT_ASSIGN_OPS (uint64)
+OCTAVE_MM_INT_ASSIGN_OPS (mm, uint64_, uint64_, uint64_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmx, uint64_, , )
+OCTAVE_MM_INT_ASSIGN_OPS (mmc, uint64_, complex_, )
+
+OCTAVE_MS_INT_ASSIGN_OPS (mi8, uint64_, int8_, int8_)
+OCTAVE_MS_INT_ASSIGN_OPS (mui8, uint64_, uint8_, uint8_)
+OCTAVE_MS_INT_ASSIGN_OPS (mi16, uint64_, int16_, int16_)
+OCTAVE_MS_INT_ASSIGN_OPS (mui16, uint64_, uint16_, uint16_)
+OCTAVE_MS_INT_ASSIGN_OPS (mi32, uint64_, int32_, int32_)
+OCTAVE_MS_INT_ASSIGN_OPS (mui32, uint64_, uint32_, uint32_)
+OCTAVE_MS_INT_ASSIGN_OPS (mi64, uint64_, int64_, int64_)
+
+OCTAVE_MM_INT_ASSIGN_OPS (mmi8, uint64_, int8_, int8_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmui8, uint64_, uint8_, uint8_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmi16, uint64_, int16_, int16_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmui16, uint64_, uint16_, uint16_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmi32, uint64_, int32_, int32_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmui32, uint64_, uint32_, uint32_)
+OCTAVE_MM_INT_ASSIGN_OPS (mmi64, uint64_, int64_, int64_)
 
 void
 install_ui64_ui64_ops (void)
 {
   OCTAVE_INSTALL_S_INT_UNOPS (uint64);
-  OCTAVE_INSTALL_SS_INT_CMP_OPS (uint64, uint64);
-  OCTAVE_INSTALL_SS_INT_BOOL_OPS (uint64, uint64);
+  OCTAVE_INSTALL_SS_INT_CMP_OPS (ss, uint64_, uint64_);
+  OCTAVE_INSTALL_SS_INT_BOOL_OPS (ss, uint64_, uint64_);
+
+  OCTAVE_INSTALL_SM_INT_CMP_OPS (sm, uint64_, uint64_);
+  OCTAVE_INSTALL_SM_INT_BOOL_OPS (sm, uint64_, uint64_);
 
-  OCTAVE_INSTALL_SM_INT_CMP_OPS (uint64, uint64);
-  OCTAVE_INSTALL_SM_INT_BOOL_OPS (uint64, uint64);
-
-  OCTAVE_INSTALL_MS_INT_CMP_OPS (uint64, uint64);
-  OCTAVE_INSTALL_MS_INT_BOOL_OPS (uint64, uint64);
+  OCTAVE_INSTALL_MS_INT_CMP_OPS (ms, uint64_, uint64_);
+  OCTAVE_INSTALL_MS_INT_BOOL_OPS (ms, uint64_, uint64_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (ms, uint64_, uint64_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mx, uint64_, );
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mc, uint64_, complex_);
 
   OCTAVE_INSTALL_M_INT_UNOPS (uint64);
   OCTAVE_INSTALL_MM_INT_CMP_OPS (uint64, uint64);
   OCTAVE_INSTALL_MM_INT_BOOL_OPS (uint64, uint64);
-  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (uint64);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mm, uint64_, uint64_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmx, uint64_, );
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmc, uint64_, complex_);
+
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mi8, uint64_, int8_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mui8, uint64_, uint8_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mi16, uint64_, int16_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mui16, uint64_, uint16_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mi32, uint64_, int32_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mui32, uint64_, uint32_);
+  OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mi64, uint64_, int64_);
+
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmi8, uint64_, int8_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmui8, uint64_, uint8_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmi16, uint64_, int16_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmui16, uint64_, uint16_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmi32, uint64_, int32_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmui32, uint64_, uint32_);
+  OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmi64, uint64_, int64_);
 }
 
 /*