[Octave-cvsupdate] octave-forge/main/comm Makefile,1.29,1.30 op-gm-gm.cc,1.5,1.6

[David B. <ad...@us...>]

Update of /cvsroot/octave/octave-forge/main/comm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18157/main/comm

Modified Files:
	Makefile op-gm-gm.cc 
Log Message:
HAVE_OCTAVE_UPLUS config option for backwards compatiability

Index: op-gm-gm.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/op-gm-gm.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- op-gm-gm.cc	15 Nov 2004 10:26:54 -0000	1.5
+++ op-gm-gm.cc	16 Nov 2004 10:31:58 -0000	1.6
@@ -43,12 +43,14 @@
   return new octave_galois (v.galois_value());
 }
 
+#ifdef HAVE_OCTAVE_UPLUS
 DEFUNOP (uplus, galois)
 {
   CAST_UNOP_ARG (const octave_galois&);
 
   return new octave_galois (v.galois_value());
 }
+#endif
 
 DEFUNOP (transpose, galois)
 {
@@ -96,7 +98,9 @@
 {
   INSTALL_UNOP (op_not, octave_galois, not);
   INSTALL_UNOP (op_uminus, octave_galois, uminus);
+#ifdef HAVE_OCTAVE_UPLUS
   INSTALL_UNOP (op_uplus, octave_galois, uplus);
+#endif
   INSTALL_UNOP (op_transpose, octave_galois, transpose);
   INSTALL_UNOP (op_hermitian, octave_galois, transpose);
 

Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile	8 Sep 2004 07:41:48 -0000	1.29
+++ Makefile	16 Nov 2004 10:31:58 -0000	1.30
@@ -29,7 +29,7 @@
 
 DELETES = $(OBJECTS) $(GALOISDEPENDS) $(OTHERDEPENDS) *~ $(TARGETS) core octave-core
 
-DEFINES = -DGALOIS_DISP_PRIVATES $(HAVE_DO_FORTRAN_INDEXING) $(HAVE_PROPAGATE_EMPTY_MATRICES) $(HAVE_ND_ARRAYS) $(TYPEID_HAS_CLASS) $(CLASS_HAS_LOAD_SAVE) $(HAVE_OCTAVE_CONCAT) $(HAVE_SWAP_BYTES)
+DEFINES = -DGALOIS_DISP_PRIVATES $(HAVE_DO_FORTRAN_INDEXING) $(HAVE_PROPAGATE_EMPTY_MATRICES) $(HAVE_ND_ARRAYS) $(TYPEID_HAS_CLASS) $(CLASS_HAS_LOAD_SAVE) $(HAVE_OCTAVE_CONCAT) $(HAVE_SWAP_BYTES) $(HAVE_OCTAVE_UPLUS)
 MOFLAGS =
 
 .PHONY: all dist clean realclean count $(SUBDIRS)