# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1249626133 -7200
# Node ID 0cb90d7fe46ae7415cc47cb92635b2fc607a5815
# Parent  73ca5cee6bb6b48eb58987cc86bbc99fba626fc8
complete change d5570d4b1116

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-06  Jaroslav Hajek  <highegg@gmail.com>
+
+	* OPERATORS/op-dm-template.cc, OPERATORS/op-pm-template.cc:
+	Also define conversions for null string and null sq_string.
+
 2009-08-06  John W. Eaton  <jwe@octave.org>
 
 	* OPERATORS/op-cdm-m.cc, OPERATORS/op-dm-m.cc, OPERATORS/op-pm-m.cc:
diff --git a/src/OPERATORS/op-dm-template.cc b/src/OPERATORS/op-dm-template.cc
--- a/src/OPERATORS/op-dm-template.cc
+++ b/src/OPERATORS/op-dm-template.cc
@@ -89,5 +89,7 @@
 #endif
 #ifdef DEFINENULLASSIGNCONV
   INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX);
+  INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX);
+  INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX);
 #endif
 }
diff --git a/src/OPERATORS/op-pm-template.cc b/src/OPERATORS/op-pm-template.cc
--- a/src/OPERATORS/op-pm-template.cc
+++ b/src/OPERATORS/op-pm-template.cc
@@ -84,5 +84,7 @@
 #endif
 #ifdef DEFINENULLASSIGNCONV
   INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX);
+  INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX);
+  INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX);
 #endif
 }