Quick and dirty fix for gcc-2.95.

This commit is contained in:
espie 1999-07-21 16:54:45 +00:00
parent 9f72a3de16
commit c70172c815
3 changed files with 68 additions and 0 deletions

View File

@ -38,6 +38,7 @@ DEBUG=
# environment variable is unset. SP now automatically searches for a file
# called "catalog" in the same directory as the document entity.
DEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"${PREFIX}/share/sgml/catalog\"
DEFINES+=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST
INCLUDES+=-I. -I${.CURDIR}/../include -I${.CURDIR}/../generic
CXXFLAGS=-ansi $(DEBUG) $(WARN) $(DEFINES) $(INCLUDES)

View File

@ -0,0 +1,56 @@
--- lib/entmgr_inst.cxx.orig Wed Jul 21 16:21:12 1999
+++ lib/entmgr_inst.cxx Wed Jul 21 16:22:00 1999
@@ -436,7 +436,7 @@
#pragma define(Vector<String<EquivCode> >)
#else
#ifdef SP_ANSI_CLASS_INST
-template class Vector<String<EquivCode> >;
+//template class Vector<String<EquivCode> >;
#else
typedef Vector<String<EquivCode> > Dummy_30;
#endif
@@ -566,7 +566,7 @@
#pragma define(SharedXcharMap<unsigned char>)
#else
#ifdef SP_ANSI_CLASS_INST
-template class SharedXcharMap<unsigned char>;
+//template class SharedXcharMap<unsigned char>;
#else
typedef SharedXcharMap<unsigned char> Dummy_40;
#endif
@@ -592,7 +592,7 @@
#pragma define(String<EquivCode>)
#else
#ifdef SP_ANSI_CLASS_INST
-template class String<EquivCode>;
+//template class String<EquivCode>;
#else
typedef String<EquivCode> Dummy_42;
#endif
@@ -631,7 +631,7 @@
#pragma define(XcharMap<unsigned char>)
#else
#ifdef SP_ANSI_CLASS_INST
-template class XcharMap<unsigned char>;
+//template class XcharMap<unsigned char>;
#else
typedef XcharMap<unsigned char> Dummy_45;
#endif
@@ -670,7 +670,7 @@
#pragma define(Vector<PackedBoolean>)
#else
#ifdef SP_ANSI_CLASS_INST
-template class Vector<PackedBoolean>;
+//template class Vector<PackedBoolean>;
#else
typedef Vector<PackedBoolean> Dummy_48;
#endif
@@ -683,7 +683,7 @@
#pragma define(SubstTable<Char>)
#else
#ifdef SP_ANSI_CLASS_INST
-template class SubstTable<Char>;
+//template class SubstTable<Char>;
#else
typedef SubstTable<Char> Dummy_49;
#endif

View File

@ -0,0 +1,11 @@
--- lib/parser_inst.cxx.orig Wed Jul 21 16:26:55 1999
+++ lib/parser_inst.cxx Wed Jul 21 16:27:09 1999
@@ -1344,7 +1344,7 @@
#pragma define(Vector<unsigned int>)
#else
#ifdef SP_ANSI_CLASS_INST
-template class Vector<unsigned int>;
+//template class Vector<unsigned int>;
#else
typedef Vector<unsigned int> Dummy_97;
#endif