Merge branch 'master' into nomerge2

This commit is contained in:
Ivan Skytte Jørgensen
2016-08-11 16:51:52 +02:00
7 changed files with 11 additions and 15 deletions

@ -78,7 +78,6 @@ bool Phrases::set( const Words *words, const Bits *bits, int32_t niceness ) {
if ( ! m_wids[i] ) {
continue;
}
QUICKPOLL(niceness);
setPhrase ( i );
}

@ -1,8 +1,7 @@
// Matt Wells, copyright Jul 2001
#include "gb-include.h"
#include "StopWords.h"
#include "gb-include.h"
#include "HashTableX.h"
#include "Speller.h"
#include "Loop.h"

@ -3,7 +3,7 @@
#ifndef GB_STOPWORDS_H
#define GB_STOPWORDS_H
#include "Unicode.h"
#include <inttypes.h>
// . this returns true if h is the hash of an ENGLISH stop word
// . list taken from www.superjournal.ac.uk/sj/application/demo/stopword.htm

@ -2767,7 +2767,7 @@ void UdpServer::printState() {
}
void UdpServer::saveActiveSlots(int fd, msg_type_t msg_type) {
for (const UdpSlot *slot = m_activeListHead; slot; slot = slot->getActiveListNext()) {
for (const UdpSlot *slot = m_activeListHead; slot; slot = slot->m_activeListNext) {
// skip if not wanted msg type
if (slot->getMsgType() != msg_type) {
continue;
@ -2793,7 +2793,7 @@ void UdpServer::saveActiveSlots(int fd, msg_type_t msg_type) {
std::vector<UdpStatistic> UdpServer::getStatistics() const {
std::vector<UdpStatistic> statistics;
for (const UdpSlot *slot = m_activeListHead; slot; slot = slot->getActiveListNext()) {
for (const UdpSlot *slot = m_activeListHead; slot; slot = slot->m_activeListNext) {
statistics.push_back(UdpStatistic(*slot));
}

@ -100,9 +100,6 @@ public:
bool hasCalledHandler() const { return m_calledHandler; }
bool hasCalledCallback() const { return m_calledCallback; }
UdpSlot* getActiveListNext() { return m_activeListNext; }
const UdpSlot* getActiveListNext() const { return m_activeListNext; }
bool isIncoming() const { return m_incoming; }
const char* getExtraInfo() const { return m_extraInfo; }

@ -1,6 +1,7 @@
#include "gb-include.h"
//#include "gb-include.h"
#include "Words.h"
#include "Xml.h"
#include "Unicode.h" // getUtf8CharSize()
#include "StopWords.h"
#include "Speller.h"

10
Words.h

@ -8,6 +8,9 @@
#define GB_WORDS_H
#include "max_words.h"
#include "StopWords.h"
#include "XmlNode.h"
#include <inttypes.h>
// now Matches.h has 300 Words classes handy... try to do away with this
// make sure it does not slow us down!!
@ -17,11 +20,8 @@ char *getFieldValue ( char *s ,int32_t slen, const char *field , int32_t *value
unsigned char getCharacterLanguage ( const char *utf8Char ) ;
#include "Xml.h"
#include "SafeBuf.h"
#include "StopWords.h"
#include "fctypes.h"
#include "Titledb.h"
class Xml;
#define NUM_LANGUAGE_SAMPLES 1000