diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-08 23:06:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-08 23:06:13 +0200 |
commit | bf53279b2f606f36abf287249896d419ae788097 (patch) | |
tree | c63f32bd5e142c7bacec7482826e904a16f872eb /fsa/src | |
parent | 24bb172e5d6dd43422304665fdb411366b49097e (diff) |
Revert "Clean up what you have allocated."
Diffstat (limited to 'fsa/src')
-rw-r--r-- | fsa/src/vespa/fsa/segmenter.cpp | 24 | ||||
-rw-r--r-- | fsa/src/vespa/fsa/segmenter.h | 19 | ||||
-rw-r--r-- | fsa/src/vespa/fsamanagers/rwlock.cpp | 1 |
3 files changed, 18 insertions, 26 deletions
diff --git a/fsa/src/vespa/fsa/segmenter.cpp b/fsa/src/vespa/fsa/segmenter.cpp index fc7d30e9a9b..91f5a611f13 100644 --- a/fsa/src/vespa/fsa/segmenter.cpp +++ b/fsa/src/vespa/fsa/segmenter.cpp @@ -12,33 +12,13 @@ #include "config.h" #endif +#include <stdio.h> + #include "segmenter.h" namespace fsa { -Segmenter::Segments::Segments() - : _text(), _segments(), _map(), - _segmentation(Segmenter::SEGMENTATION_METHODS,NULL) -{ } - -Segmenter::Segments::~Segments() -{ - clear(); -} - -void -Segmenter::Segments::clear() -{ - _segments.clear(); - _map.init(_text.size()); - initSingles(); - for(unsigned int i=0;i<SEGMENTATION_METHODS;i++){ - delete _segmentation[i]; - _segmentation[i] = nullptr; - } -} - // {{{ Segmenter::Segments::initSingles void Segmenter::Segments::initSingles() diff --git a/fsa/src/vespa/fsa/segmenter.h b/fsa/src/vespa/fsa/segmenter.h index 74254639538..f40f27f522b 100644 --- a/fsa/src/vespa/fsa/segmenter.h +++ b/fsa/src/vespa/fsa/segmenter.h @@ -360,8 +360,12 @@ public: unsigned int end); public: - Segments(); - ~Segments(); + /** Default constructor */ + Segments() : _text(), _segments(), _map(), + _segmentation(Segmenter::SEGMENTATION_METHODS,NULL) {} + + /** Destructor */ + ~Segments() {} /** * @brief Set input text, and clear all results. @@ -409,7 +413,16 @@ public: /** * @brief Clear all detected segments and built segmentations. */ - void clear(); + void clear() + { + _segments.clear(); + _map.init(_text.size()); + initSingles(); + for(unsigned int i=0;i<SEGMENTATION_METHODS;i++){ + delete _segmentation[i]; + _segmentation[i]=NULL; + } + } /** * @brief Insert a detected segment. diff --git a/fsa/src/vespa/fsamanagers/rwlock.cpp b/fsa/src/vespa/fsamanagers/rwlock.cpp index 4de79cd5146..9c296dfe980 100644 --- a/fsa/src/vespa/fsamanagers/rwlock.cpp +++ b/fsa/src/vespa/fsamanagers/rwlock.cpp @@ -49,7 +49,6 @@ RWLock::~RWLock(void) #ifndef DISABLE_THREADS pthread_rwlock_destroy(&(_impl->_rwlock)); #endif - delete _impl; } bool RWLock::tryRdLock (void) |