diff --git a/src/dom/xpathparser.h b/src/dom/xpathparser.h
index 7a5b7cb55c3076894b58614b9b25f763f182c9f4..1ad4b5f549025d0b459b68bb7181467632cab5e5 100644 (file)
--- a/src/dom/xpathparser.h
+++ b/src/dom/xpathparser.h
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2007 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include <stdio.h>
#include <stdarg.h>
-#include <glib.h>
#include <string>
#include <vector>
typedef struct
{
int ival;
- char *sval;
+ char const *sval;
} LookupEntry;
{
if (type == OPERATOR)
{
- char *tokenStr = "unknown";
- for (LookupEntry *entry = operatorTable; entry->sval ; entry++)
+ char const *tokenStr = "unknown";
+ for (LookupEntry const *entry = operatorTable; entry->sval ; entry++)
{
if (entry->ival == ival)
{
}
else if (type == NODE_TYPE)
{
- char *tokenStr = "unknown";
+ char const *tokenStr = "unknown";
for (LookupEntry *entry = nodeTypeTable; entry->sval ; entry++)
{
if (entry->ival == ival)
}
else if (type == AXIS_NAME)
{
- char *tokenStr = "unknown";
+ char const *tokenStr = "unknown";
for (LookupEntry *entry = axisNameTable; entry->sval ; entry++)
{
if (entry->ival == ival)
printf("#%f\n", dval);
else
{
- char *tokenStr = "unknown";
+ char const *tokenStr = "unknown";
for (LookupEntry *entry = exprTokenTable; entry->sval ; entry++)
{
if (entry->ival == type)
*/
XPathParser()
{
- debug = false;
+ debug = false;
}
/**
*
*/
- ~XPathParser() {}
+ virtual ~XPathParser() {}
/**
*
/**
*
*/
- void trace(const char *fmt, ...) G_GNUC_PRINTF(2,3);
+ void trace(const char *fmt, ...)
+ #ifdef G_GNUC_PRINTF
+ G_GNUC_PRINTF(2, 3)
+ #endif
+ ;
/**
*
/**
*
*/
- void error(const char *fmt, ...) G_GNUC_PRINTF(2,3);
+ void error(const char *fmt, ...)
+ #ifdef G_GNUC_PRINTF
+ G_GNUC_PRINTF(2, 3)
+ #endif
+ ;
//#################################
//# LEXICAL SCANNING