Mercurial > hg > octave-nkf

changeset 6105:bf8366f93881

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-26 21:46:29 by jwe]
author jwe
date Thu, 26 Oct 2006 21:46:29 +0000
parents a334206512b9
children 82fff8a063c2
files liboctave/ChangeLog liboctave/oct-inttypes.cc
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-26  John W. Eaton  <jwe@octave.org>
+
+	* oct-inttypes.cc (INSTANTIATE_INTTYPE_BIN_OP): Provide explicit
+	type qualification for OP.
+
 2006-10-26  David Bateman  <dbateman@free.fr>
 
 	* Sparse.cc (Sparse<T>::resize_no_fill (octave_idx_type,
--- a/liboctave/oct-inttypes.cc
+++ b/liboctave/oct-inttypes.cc
@@ -102,8 +102,8 @@
 INSTANTIATE_INTTYPE (uint64_t);
 
 #define INSTANTIATE_INTTYPE_BIN_OP(T1, T2, OP) \
-  template octave_int<octave_int_binop_traits<T1, T2>::TR> \
-  operator OP (const octave_int<T1>&, const octave_int<T2>&)
+  template OCTAVE_API octave_int<octave_int_binop_traits<T1, T2>::TR> \
+  operator OP<T1, T2> (const octave_int<T1>&, const octave_int<T2>&)
 
 #define INSTANTIATE_INTTYPE_BIN_OPS(T1, T2) \
   INSTANTIATE_INTTYPE_BIN_OP (T1, T2, +); \