ov-classdef.h:808:3: error: a class-key must be used when declaring a friend

[Ben Abbott]

For gcc 4.5 from Macports on MacOS X 10.7.5 I need the following change 
(changeset is attached also)

diff --git a/libinterp/octave-value/ov-classdef.h 
b/libinterp/octave-value/ov-classdef.h
--- a/libinterp/octave-value/ov-classdef.h
+++ b/libinterp/octave-value/ov-classdef.h
@@ -805,7 +805,7 @@
 class
 cdef_property : public cdef_object
 {
-  friend cdef_class;
+  friend class cdef_class;
 
 private:
 
@@ -892,7 +892,7 @@
 class
 cdef_method : public cdef_object
 {
-  friend cdef_class;
+  friend class cdef_class;
 
 private:
 
@@ -1068,7 +1068,7 @@
 class
 cdef_package : public cdef_object
 {
-  friend cdef_class;
+  friend class cdef_class;
 
 private:

The error I encountered is below.

/bin/sh ../libtool  --tag=CXX   --mode=compile /opt/local/bin/g++-mp-4.5 
-DHAVE_CONFIG_H -I. -I..  -I../liboctave/cruft/misc -I../liboctave/array 
-I../liboctave/numeric -I../liboctave/numeric -I../liboctave/operators 
-I../liboctave/operators -I../liboctave/system -I../liboctave/util 
-I./octave-value -I./operators -Iparse-tree -I./parse-tree -Iinterp-core 
-I./interp-core -Iinterpfcn -I./interpfcn -Icorefcn -I../libgnu -I../libgnu 
-D_THREAD_SAFE -I/opt/local/include -I/opt/local/include  -isystem 
/opt/local/libexec/llvm-3.1/include -I/opt/local/include/freetype2 
-I/opt/local/include   -I/opt/local/include   -Wall -W -Wshadow 
-Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align 
-Wcast-qual -pipe -O0 -g -m64 -ggdb3 -gstabs -D_THREAD_SAFE -D_THREAD_SAFE 
-pthread -MT parse-tree/parse_tree_libparse_tree_la-pt-classdef.lo -MD -MP -MF 
parse-tree/.deps/parse_tree_libparse_tree_la-pt-classdef.Tpo -c -o 
parse-tree/parse_tree_libparse_tree_la-pt-classdef.lo `test -f 
'parse-tree/pt-classdef.cc' || echo './'`parse-tree/pt-classdef.cc
libtool: compile:  /opt/local/bin/g++-mp-4.5 -DHAVE_CONFIG_H -I. -I.. 
-I../liboctave/cruft/misc -I../liboctave/array -I../liboctave/numeric 
-I../liboctave/numeric -I../liboctave/operators -I../liboctave/operators 
-I../liboctave/system -I../liboctave/util -I./octave-value -I./operators 
-Iparse-tree -I./parse-tree -Iinterp-core -I./interp-core -Iinterpfcn 
-I./interpfcn -Icorefcn -I../libgnu -I../libgnu -D_THREAD_SAFE 
-I/opt/local/include -I/opt/local/include -isystem 
/opt/local/libexec/llvm-3.1/include -I/opt/local/include/freetype2 
-I/opt/local/include -I/opt/local/include -Wall -W -Wshadow -Wold-style-cast 
-Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual -pipe -O0 -g 
-m64 -ggdb3 -gstabs -D_THREAD_SAFE -D_THREAD_SAFE -pthread -MT 
parse-tree/parse_tree_libparse_tree_la-pt-classdef.lo -MD -MP -MF 
parse-tree/.deps/parse_tree_libparse_tree_la-pt-classdef.Tpo -c 
parse-tree/pt-classdef.cc  -fno-common -DPIC -o 
parse-tree/.libs/parse_tree_libparse_tree_la-pt-classdef.o
In file included from parse-tree/pt-classdef.cc:27:0:
./octave-value/ov-classdef.h:808:3: error: a class-key must be used when 
declaring a friend
./octave-value/ov-classdef.h:808:3: error: friend declaration does not name a 
class or function
./octave-value/ov-classdef.h:895:3: error: a class-key must be used when 
declaring a friend
./octave-value/ov-classdef.h:895:3: error: friend declaration does not name a 
class or function
./octave-value/ov-classdef.h:1071:3: error: a class-key must be used when 
declaring a friend
./octave-value/ov-classdef.h:1071:3: error: friend declaration does not name a 
class or function

I wanted to run the changeset past you before pushing it.  Do you have any 
concerns?

Ben

changeset.patch
Description: Binary data