- fixed some issues when compiling with gcc-2.95.3. At least three more

problems remain, though.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8615 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2004-08-21 08:55:12 +00:00
parent 6c29244a56
commit c7000cc7b3
4 changed files with 14 additions and 8 deletions
+4 -2
View File
@@ -120,8 +120,10 @@ private:
status_t fInitStatus; status_t fInitStatus;
vnode_id fId; vnode_id fId;
SinglyLinkedList<DirectoryIterator*> fIteratorList; SinglyLinkedList<DirectoryIterator*> fIteratorList;
FileEntry<file_icb_entry> fFileEntry; /* [zooey]: gcc-2.95.3 requires the explicit namespace here, otherwise
FileEntry<extended_file_icb_entry> fExtendedEntry; it complains about a syntax error(!). This is most probably a bug. */
Udf::FileEntry<file_icb_entry> fFileEntry;
Udf::FileEntry<extended_file_icb_entry> fExtendedEntry;
}; };
/*! \brief Does the dirty work of reading using the given DescriptorList object /*! \brief Does the dirty work of reading using the given DescriptorList object
@@ -39,7 +39,11 @@
#undef HAVE_INITFINI #undef HAVE_INITFINI
/* Define if __attribute__((section("foo"))) puts quotes around foo. */ /* Define if __attribute__((section("foo"))) puts quotes around foo. */
#define HAVE_SECTION_QUOTES 1 /*#define HAVE_SECTION_QUOTES 1
[zooey]: defining this causes assembler errors, and I don't think
that any BeOS-gcc actually produces quotes in sections...
*/
#undef HAVE_SECTION_QUOTES
/* Define if using the GNU assembler, gas. */ /* Define if using the GNU assembler, gas. */
#define HAVE_GNU_AS 1 #define HAVE_GNU_AS 1
@@ -32,12 +32,12 @@ const uint32 _B_TRANSPARENT_MAGIC_RGBA32_BIG = 0x77747700;
// misc. // misc.
const struct screen_id _B_MAIN_SCREEN_ID = {0}; const struct screen_id _B_MAIN_SCREEN_ID = {0};
template<class T> void compare(T a, T b); template<class T> void compare(T &a, T &b);
template<> template<>
void void
compare<pattern>(const pattern &a, const pattern &b) compare<const pattern>(const pattern &a, const pattern &b)
{ {
for (int32 i = 0; i < 8; i++) for (int32 i = 0; i < 8; i++)
CHK(a.data[i] == b.data[i]); CHK(a.data[i] == b.data[i]);
@@ -46,7 +46,7 @@ compare<pattern>(const pattern &a, const pattern &b)
template<> template<>
void void
compare<rgb_color>(const rgb_color a, const rgb_color b) compare<const rgb_color>(const rgb_color &a, const rgb_color &b)
{ {
CHK(a.red == b.red); CHK(a.red == b.red);
CHK(a.green == b.green); CHK(a.green == b.green);
@@ -57,7 +57,7 @@ compare<rgb_color>(const rgb_color a, const rgb_color b)
template<class T> template<class T>
void void
compare(T a, T b) compare(T &a, T &b)
{ {
CHK(a == b); CHK(a == b);
} }
+1 -1
View File
@@ -6,7 +6,7 @@ GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
SubDirC++Flags -Wno-sign-compare -Wno-unused ; SubDirC++Flags -Wno-sign-compare -Wno-unused ;
} }
SharedLibrary rdef : compile.cpp decompile.cpp lexer.l parser.y rdef.cpp : be ; SharedLibrary rdef : compile.cpp decompile.cpp lexer.l parser.y rdef.cpp : be stdc++.r4 ;
AbsSymLink <boot!home!config!lib>librdef.so : librdef.so AbsSymLink <boot!home!config!lib>librdef.so : librdef.so
: /boot/home/config/lib : false ; : /boot/home/config/lib : false ;