diff --git a/vvm/vvm.h b/vvm/vvm.h
index 7d43a9657..d7bc10f95 100644
--- a/vvm/vvm.h
+++ b/vvm/vvm.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vvm.h,v 1.23 1999/11/22 00:30:52 steve Exp $"
+#ident "$Id: vvm.h,v 1.24 1999/12/02 03:36:01 steve Exp $"
 #endif
 
 # include  <cassert>
@@ -106,7 +106,7 @@ class vvm_bits_t {
       virtual unsigned get_width() const =0;
       virtual vpip_bit_t get_bit(unsigned idx) const =0;
 
-      unsigned as_unsigned();
+      unsigned as_unsigned() const;
 };
 
 extern ostream& operator << (ostream&os, vpip_bit_t);
@@ -294,6 +294,9 @@ class vvm_memory_t : public __vpiMemory {
 
 /*
  * $Log: vvm.h,v $
+ * Revision 1.24  1999/12/02 03:36:01  steve
+ *  shiftl and shiftr take unsized second parameter.
+ *
  * Revision 1.23  1999/11/22 00:30:52  steve
  *  Detemplate some and, or and nor methods.
  *
diff --git a/vvm/vvm_bit.cc b/vvm/vvm_bit.cc
index 5be1dab27..27aabcdf1 100644
--- a/vvm/vvm_bit.cc
+++ b/vvm/vvm_bit.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vvm_bit.cc,v 1.6 1999/11/22 00:30:52 steve Exp $"
+#ident "$Id: vvm_bit.cc,v 1.7 1999/12/02 03:36:01 steve Exp $"
 #endif
 
 # include  "vvm.h"
@@ -69,7 +69,7 @@ vvm_bits_t::~vvm_bits_t()
 {
 }
 
-unsigned vvm_bits_t::as_unsigned()
+unsigned vvm_bits_t::as_unsigned() const
 {
       unsigned result = 0;
       unsigned width = get_width();
@@ -142,6 +142,9 @@ vpip_bit_t add_with_carry(vpip_bit_t l, vpip_bit_t r, vpip_bit_t&carry)
 
 /*
  * $Log: vvm_bit.cc,v $
+ * Revision 1.7  1999/12/02 03:36:01  steve
+ *  shiftl and shiftr take unsized second parameter.
+ *
  * Revision 1.6  1999/11/22 00:30:52  steve
  *  Detemplate some and, or and nor methods.
  *
diff --git a/vvm/vvm_func.h b/vvm/vvm_func.h
index c70d02bd6..35eb3bba4 100644
--- a/vvm/vvm_func.h
+++ b/vvm/vvm_func.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vvm_func.h,v 1.15 1999/10/28 00:47:25 steve Exp $"
+#ident "$Id: vvm_func.h,v 1.16 1999/12/02 03:36:01 steve Exp $"
 #endif
 
 # include  "vvm.h"
@@ -217,7 +217,7 @@ vvm_bitset_t<WIDTH> vvm_binop_xor(const vvm_bitset_t<WIDTH>&l,
  */
 template <unsigned WIDTH>
 vvm_bitset_t<WIDTH> vvm_binop_shiftl(const vvm_bitset_t<WIDTH>&l,
-				  const vvm_bitset_t<32>&r)
+				     const vvm_bits_t&r)
 {
       vvm_bitset_t<WIDTH> result;
       vvm_u32 s = r.as_unsigned();
@@ -234,7 +234,7 @@ vvm_bitset_t<WIDTH> vvm_binop_shiftl(const vvm_bitset_t<WIDTH>&l,
  */
 template <unsigned WIDTH>
 vvm_bitset_t<WIDTH> vvm_binop_shiftr(const vvm_bitset_t<WIDTH>&l,
-				  const vvm_bitset_t<32>&r)
+				     const vvm_bits_t&r)
 {
       vvm_bitset_t<WIDTH> result;
       vvm_u32 s = r.as_unsigned();
@@ -608,6 +608,9 @@ vvm_bitset_t<W> vvm_ternary(vpip_bit_t c, const vvm_bitset_t<W>&t,
 
 /*
  * $Log: vvm_func.h,v $
+ * Revision 1.16  1999/12/02 03:36:01  steve
+ *  shiftl and shiftr take unsized second parameter.
+ *
  * Revision 1.15  1999/10/28 00:47:25  steve
  *  Rewrite vvm VPI support to make objects more
  *  persistent, rewrite the simulation scheduler