summaryrefslogtreecommitdiffstats
path: root/indexlib
diff options
context:
space:
mode:
Diffstat (limited to 'indexlib')
-rw-r--r--indexlib/boost-compat/shared_ptr.hpp2
-rw-r--r--indexlib/boost-compat/weak_ptr.hpp6
-rw-r--r--indexlib/manager.h2
-rw-r--r--indexlib/match.cpp10
-rw-r--r--indexlib/match.h4
-rw-r--r--indexlib/mempool.h10
6 files changed, 17 insertions, 17 deletions
diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.hpp
index ec88ae2e1..0a3bf6d86 100644
--- a/indexlib/boost-compat/shared_ptr.hpp
+++ b/indexlib/boost-compat/shared_ptr.hpp
@@ -445,7 +445,7 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
#if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
// g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// aptqparently EDG 2.38 also doesn't accept it
+// apparently EDG 2.38 also doesn't accept it
template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
{
diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.hpp
index 8a0637847..c23850079 100644
--- a/indexlib/boost-compat/weak_ptr.hpp
+++ b/indexlib/boost-compat/weak_ptr.hpp
@@ -51,11 +51,11 @@ public:
//
// has a serious problem.
//
-// r.px may already have been tqinvalidated. The px(r.px)
+// r.px may already have been invalidated. The px(r.px)
// conversion may require access to *r.px (virtual inheritance).
//
// It is not possible to avoid spurious access violations since
-// in multithreaded programs r.px may be tqinvalidated at any point.
+// in multithreaded programs r.px may be invalidated at any point.
//
template<class Y>
@@ -106,7 +106,7 @@ public:
catch(bad_weak_ptr const &)
{
// Q: how can we get here?
- // A: another thread may have tqinvalidated r after the use_count test above.
+ // A: another thread may have invalidated r after the use_count test above.
return shared_ptr<element_type>();
}
diff --git a/indexlib/manager.h b/indexlib/manager.h
index aaa087132..6224a9db4 100644
--- a/indexlib/manager.h
+++ b/indexlib/manager.h
@@ -51,7 +51,7 @@ class memory_manager {
/** Returns the size of the block */
virtual unsigned size() const = 0;
/** Resizes the block.
- * This tqinvalidates all previously returned pointers
+ * This invalidates all previously returned pointers
*/
virtual void resize( unsigned ) = 0;
};
diff --git a/indexlib/match.cpp b/indexlib/match.cpp
index 3a56c28d8..ce2c5cff5 100644
--- a/indexlib/match.cpp
+++ b/indexlib/match.cpp
@@ -47,17 +47,17 @@ namespace {
}
indexlib::Match::Match( std::string str, unsigned flags ):
- tqmasks_( 256 ),
+ masks_( 256 ),
caseinsensitive_( flags & caseinsensitive ),
pattern_rest_( str, kMin( str.size(), sizeof( unsigned ) * 8 - 1 ) )
{
hot_bit_ = kMin( str.size(), sizeof( unsigned ) * 8 - 1 );
for ( unsigned i = 0; i != hot_bit_; ++i ) {
if ( caseinsensitive_ ) {
- setbit( tqmasks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
- setbit( tqmasks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
+ setbit( masks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
+ setbit( masks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
} else {
- setbit( tqmasks_[ ( unsigned char )str[ i ] ], i );
+ setbit( masks_[ ( unsigned char )str[ i ] ], i );
}
}
}
@@ -69,7 +69,7 @@ bool indexlib::Match::process( const char* string ) const {
unsigned state = 0;
while ( *string ) {
state |= 1;
- state &= tqmasks_[ ( unsigned char )*string ];
+ state &= masks_[ ( unsigned char )*string ];
state <<= 1;
++string;
if ( getbit( state, hot_bit_ ) && ( pattern_rest_ == std::string( string, pattern_rest_.size() ) ) ) return true;
diff --git a/indexlib/match.h b/indexlib/match.h
index 9c8fc24f9..0c51dbf24 100644
--- a/indexlib/match.h
+++ b/indexlib/match.h
@@ -64,8 +64,8 @@ class Match {
bool process( const char* string ) const;
bool process( std::string str ) const { return process( str.c_str() ); }
private:
- typedef std::vector<unsigned> tqmasks_type;
- tqmasks_type tqmasks_;
+ typedef std::vector<unsigned> masks_type;
+ masks_type masks_;
unsigned hot_bit_;
bool caseinsensitive_;
std::string pattern_rest_;
diff --git a/indexlib/mempool.h b/indexlib/mempool.h
index 95416f080..fca5596d5 100644
--- a/indexlib/mempool.h
+++ b/indexlib/mempool.h
@@ -114,20 +114,20 @@ struct mempool /* : boost::noncopyable */ {
friend struct list_node_manager;
struct list_node_manager {
protected:
- const mempool* tqparent_;
+ const mempool* parent_;
public:
- explicit list_node_manager( const mempool* p = 0 ):tqparent_( p ) {}
+ explicit list_node_manager( const mempool* p = 0 ):parent_( p ) {}
void* rw_base( unsigned idx ) const {
- return tqparent_->manager_->rw_base( idx );
+ return parent_->manager_->rw_base( idx );
}
const void* ronly_base( unsigned idx ) const {
- return tqparent_->manager_->ronly_base( idx );
+ return parent_->manager_->ronly_base( idx );
}
};
START_THING( list_node, thing<list_node_manager> )
- void set_tqparent( const mempool* p ) { this->tqparent_ = p; }
+ void set_tqparent( const mempool* p ) { this->parent_ = p; }
MEMBER( uint16_t, order, 0 )
MEMBER( uint32_t, next, 2 )
MEMBER( uint32_t, prev, 6 )