pkgsrc/audio/daapd/patches/patch-ae
tron 7224b30e48 Fix questionable C++ code instead of using "-ffriend-injection" option
(which might be removed from future GCC versions) to make this build
with GCC 4.1.x.

Patch tested by Thomas 'wiz' Klausner.
2006-07-03 13:58:30 +00:00

54 lines
1.1 KiB
Text

$NetBSD: patch-ae,v 1.1 2006/07/03 13:58:31 tron Exp $
--- daaplib/include/daap/taginput.h.orig 2006-07-03 14:32:01.000000000 +0100
+++ daaplib/include/daap/taginput.h 2006-07-03 14:36:37.000000000 +0100
@@ -71,9 +71,7 @@
return( func( *this ));
}
- friend inline TagInput& end( TagInput& x ) {
- return( x.closeTag() );
- }
+ friend inline TagInput& end( TagInput& x );
//////
@@ -95,15 +93,9 @@
return( *this );
}
- friend inline TagInput& skipTag( TagInput& x ) {
- x.skipTag();
- return( x );
- }
+ friend inline TagInput& skipTag( TagInput& x );
- friend inline TagInput& skipRestOfTag( TagInput& x ) {
- x.skipRestOfTag();
- return( x );
- }
+ friend inline TagInput& skipRestOfTag( TagInput& x );
protected:
typedef std::vector<u32> StackInt32;
@@ -131,4 +123,20 @@
TagInput( const TagInput& );
TagInput& operator = ( const TagInput& );
};
+
+ inline TagInput& end( TagInput& x ) {
+ return( x.closeTag() );
+ }
+
+
+ inline TagInput& skipTag( TagInput& x ) {
+ x.skipTag();
+ return( x );
+ }
+
+ inline TagInput& skipRestOfTag( TagInput& x ) {
+ x.skipRestOfTag();
+ return( x );
+ }
+
#endif