Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-17 18:12:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

minor tweaks to silence gcc warnings

Browse source
This commit is contained in:
jez_higgins 2005-08-08 05:41:43 +00:00
parent 5b5cb43696
commit 01d697c3f6
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile.header
View file

@ -1,7 +1,7 @@
#################################### ####################################
# ARABICA CONFIG # ARABICA CONFIG
# edit for your parser choice - may include more than one USE_* # edit for your parser choice - may include more than one USE_*
PARSER_CONFIG = -DUSE_LIBXML2 -DARABICA_NO_WCHAR_T PARSER_CONFIG = -DUSE_GARDEN
#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN #PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
#################################### ####################################
@ -9,16 +9,12 @@ PARSER_CONFIG = -DUSE_LIBXML2 -DARABICA_NO_WCHAR_T
##### #####
MAKE = make MAKE = make
# C++ compiler # C++ compiler
#CXX = /home/jez/gcc-3.4.2/bin/gcc
CXX = gcc CXX = gcc
# preprocessor # preprocessor
#CPP = /home/jez/gcc-3.4.2/bin/gcc -E
CPP = gcc -E CPP = gcc -E
# linker # linker
#LD = /home/jez/gcc-3.4.2/bin/gcc
LD = gcc LD = gcc
# archiver # archiver
#AR = /home/jez/gcc-3.4.2/bin/ar r
AR = ar r AR = ar r
########### ###########
@ -33,23 +29,21 @@ COPY = cp -f
# your parser choice # your parser choice
# eg DYNAMIC_LIBS = -lexpat # eg DYNAMIC_LIBS = -lexpat
CXXFLAGS = -Wall -g CXXFLAGS = -Wall
LDFLAGS = LDFLAGS =
# Includes and library directories # Includes and library directories
#INCS_DIRS = -I.. -I/home/jez/gcc-3.4.2/include -I/usr/include/libxml2 INCS_DIRS = -I..
INCS_DIRS = -I.. -I/usr/include/libxml2 -I/usr/local/include
#LIBS_DIRS = -I/home/jez/gcc-3.4.2/lib
LIBS_DIRS = LIBS_DIRS =
STATIC_LIBS = STATIC_LIBS =
DYNAMIC_LIBS = -lxml2 -lstdc++ DYNAMIC_LIBS = -lstdc++
# link flag to create a shared library # flag to create a shared library
LINK_SHARED = -shared LINK_SHARED = -shared
EXESUFFIX = .exe EXESUFFIX =
LIBSUFFIX = .dll LIBSUFFIX = .so

2
SAX/ParserConfig.S
View file

@ -51,7 +51,9 @@ comment(lib, "xerces-c_2.lib")
#endif #endif
#endif #endif
#ifdef USE_GARDEN #ifdef USE_GARDEN
#ifdef _MSC_VER
message("Including Garden") message("Including Garden")
#endif
include <SAX/parsers/saxgarden.h> include <SAX/parsers/saxgarden.h>
undef DEF_SAX_P undef DEF_SAX_P
define DEF_SAX_P Garden define DEF_SAX_P Garden

5
SAX/parsers/saxgarden.h
View file

@ -7,6 +7,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <stack> #include <stack>
#include <map>
#include <SAX/XMLReader.h> #include <SAX/XMLReader.h>
#include <SAX/SAXParseException.h> #include <SAX/SAXParseException.h>
#include <SAX/SAXNotRecognizedException.h> #include <SAX/SAXNotRecognizedException.h>
@ -375,7 +376,9 @@ void Garden<string_type>::entityRef(iterator_t s, iterator_t e)
{ {
stringT name(str(s, e, 1)); stringT name(str(s, e, 1));
std::map<stringT, stringT>::iterator ent = declaredEntities_.find(name); typedef typename std::map<stringT, stringT>::iterator entity_iterator;
entity_iterator ent = declaredEntities_.find(name);
if(ent != declaredEntities_.end()) if(ent != declaredEntities_.end())
{ {
contentHandler_->characters((*ent).second); contentHandler_->characters((*ent).second);

2
SAX/saxlib.S
View file

@ -41,8 +41,10 @@ message("Pulling in Xerces wrappers.")
#endif #endif
#ifdef USE_GARDEN #ifdef USE_GARDEN
#ifdef _MSC_VER
message("Nothing to pull in for Garden.") message("Nothing to pull in for Garden.")
#endif #endif
#endif
#ifdef USE_EXPAT #ifdef USE_EXPAT
include <SAX/wrappers/saxexpat.cpp> include <SAX/wrappers/saxexpat.cpp>