Skip to content

Fix compatibility with Boost versions before 1.54 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanw merged 1 commit into from Oct 22, 2013
Merged

Fix compatibility with Boost versions before 1.54 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions include/StandardTokenizerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,43 @@ namespace Lucene
static const int32_t ZZ_BUFFERSIZE;

/// Translates characters to character classes
static CharArray _ZZ_CMAP;
static const wchar_t ZZ_CMAP_PACKED[];
static const int32_t ZZ_CMAP_LENGTH;
static const int32_t ZZ_CMAP_PACKED_LENGTH;

/// Translates characters to character classes
static void ZZ_CMAP_INIT(CharArray& zz_action);
static void ZZ_CMAP_INIT();
static const wchar_t* ZZ_CMAP();

/// Translates DFA states to action switch labels.
static IntArray _ZZ_ACTION;
static const wchar_t ZZ_ACTION_PACKED_0[];
static const int32_t ZZ_ACTION_LENGTH;
static const int32_t ZZ_ACTION_PACKED_LENGTH;

/// Translates DFA states to action switch labels.
static void ZZ_ACTION_INIT(IntArray& zz_action);
static void ZZ_ACTION_INIT();
static const int32_t* ZZ_ACTION();

/// Translates a state to a row index in the transition table
static IntArray _ZZ_ROWMAP;
static const wchar_t ZZ_ROWMAP_PACKED_0[];
static const int32_t ZZ_ROWMAP_LENGTH;
static const int32_t ZZ_ROWMAP_PACKED_LENGTH;

/// Translates a state to a row index in the transition table
static void ZZ_ROWMAP_INIT(IntArray& zz_rowmap);
static void ZZ_ROWMAP_INIT();
static const int32_t* ZZ_ROWMAP();

/// The transition table of the DFA
static IntArray _ZZ_TRANS;
static const wchar_t ZZ_TRANS_PACKED_0[];
static const int32_t ZZ_TRANS_LENGTH;
static const int32_t ZZ_TRANS_PACKED_LENGTH;

/// The transition table of the DFA
static void ZZ_TRANS_INIT(IntArray& zz_trans);
static void ZZ_TRANS_INIT();
static const int32_t* ZZ_TRANS();

// error codes
Expand All @@ -70,12 +74,13 @@ namespace Lucene
static const wchar_t* ZZ_ERROR_MSG[];

/// ZZ_ATTRIBUTE[aState] contains the attributes of state aState
static IntArray _ZZ_ATTRIBUTE;
static const wchar_t ZZ_ATTRIBUTE_PACKED_0[];
static const int32_t ZZ_ATTRIBUTE_LENGTH;
static const int32_t ZZ_ATTRIBUTE_PACKED_LENGTH;

/// ZZ_ATTRIBUTE[aState] contains the attributes of state aState
static void ZZ_ATTRIBUTE_INIT(IntArray& zz_attribute);
static void ZZ_ATTRIBUTE_INIT();
static const int32_t* ZZ_ATTRIBUTE();

/// The input device
Expand Down
60 changes: 30 additions & 30 deletions src/core/analysis/standard/StandardTokenizerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ namespace Lucene
{
/// Initial size of the lookahead buffer
const int32_t StandardTokenizerImpl::ZZ_BUFFERSIZE = 16384;

/// Translates characters to character classes
CharArray StandardTokenizerImpl::_ZZ_CMAP;
const wchar_t StandardTokenizerImpl::ZZ_CMAP_PACKED[] =
{
L"\11\0\1\0\1\15\1\0\1\0\1\14\22\0\1\0\5\0\1\5"
Expand Down Expand Up @@ -84,7 +85,8 @@ namespace Lucene

const int32_t StandardTokenizerImpl::ZZ_CMAP_LENGTH = 65536;
const int32_t StandardTokenizerImpl::ZZ_CMAP_PACKED_LENGTH = 1154;


IntArray StandardTokenizerImpl::_ZZ_ACTION;
const wchar_t StandardTokenizerImpl::ZZ_ACTION_PACKED_0[] =
{
L"\1\0\1\1\3\2\1\3\1\1\13\0\1\2\3\4"
Expand All @@ -95,7 +97,8 @@ namespace Lucene

const int32_t StandardTokenizerImpl::ZZ_ACTION_LENGTH = 51;
const int32_t StandardTokenizerImpl::ZZ_ACTION_PACKED_LENGTH = 50;


IntArray StandardTokenizerImpl::_ZZ_ROWMAP;
const wchar_t StandardTokenizerImpl::ZZ_ROWMAP_PACKED_0[] =
{
L"\0\0\0\16\0\34\0\52\0\70\0\16\0\106\0\124"
Expand All @@ -109,7 +112,8 @@ namespace Lucene

const int32_t StandardTokenizerImpl::ZZ_ROWMAP_LENGTH = 51;
const int32_t StandardTokenizerImpl::ZZ_ROWMAP_PACKED_LENGTH = 102;


IntArray StandardTokenizerImpl::_ZZ_TRANS;
const wchar_t StandardTokenizerImpl::ZZ_TRANS_PACKED_0[] =
{
L"\1\2\1\3\1\4\7\2\1\5\1\6\1\7\1\2"
Expand Down Expand Up @@ -167,7 +171,8 @@ namespace Lucene
L"Error: could not match input",
L"Error: pushback value was too large"
};


IntArray StandardTokenizerImpl::_ZZ_ATTRIBUTE;
const wchar_t StandardTokenizerImpl::ZZ_ATTRIBUTE_PACKED_0[] =
{
L"\1\0\1\11\3\1\1\11\1\1\13\0\4\1\2\0"
Expand Down Expand Up @@ -205,10 +210,10 @@ namespace Lucene
{
}

void StandardTokenizerImpl::ZZ_CMAP_INIT(CharArray& zz_cmap)
void StandardTokenizerImpl::ZZ_CMAP_INIT()
{
zz_cmap = CharArray::newInstance(ZZ_CMAP_LENGTH);
wchar_t* result = zz_cmap.get();
_ZZ_CMAP = CharArray::newInstance(ZZ_CMAP_LENGTH);
wchar_t* result = _ZZ_CMAP.get();

int32_t i = 0; // index in packed string
int32_t j = 0; // index in unpacked array
Expand All @@ -225,15 +230,14 @@ namespace Lucene
const wchar_t* StandardTokenizerImpl::ZZ_CMAP()
{
static boost::once_flag once = BOOST_ONCE_INIT;
static CharArray _ZZ_CMAP;
boost::call_once(once, ZZ_CMAP_INIT, _ZZ_CMAP);
boost::call_once(once, ZZ_CMAP_INIT);
return _ZZ_CMAP.get();
}

void StandardTokenizerImpl::ZZ_ACTION_INIT(IntArray& zz_action)
void StandardTokenizerImpl::ZZ_ACTION_INIT()
{
zz_action = IntArray::newInstance(ZZ_ACTION_LENGTH);
int32_t* result = zz_action.get();
_ZZ_ACTION = IntArray::newInstance(ZZ_ACTION_LENGTH);
int32_t* result = _ZZ_ACTION.get();

int32_t i = 0; // index in packed string
int32_t j = 0; // index in unpacked array
Expand All @@ -250,15 +254,14 @@ namespace Lucene
const int32_t* StandardTokenizerImpl::ZZ_ACTION()
{
static boost::once_flag once = BOOST_ONCE_INIT;
static IntArray _ZZ_ACTION;
boost::call_once(once, ZZ_ACTION_INIT, _ZZ_ACTION);
boost::call_once(once, ZZ_ACTION_INIT);
return _ZZ_ACTION.get();
}

void StandardTokenizerImpl::ZZ_ROWMAP_INIT(IntArray& zz_rowmap)
void StandardTokenizerImpl::ZZ_ROWMAP_INIT()
{
zz_rowmap = IntArray::newInstance(ZZ_ROWMAP_LENGTH);
int32_t* result = zz_rowmap.get();
_ZZ_ROWMAP = IntArray::newInstance(ZZ_ROWMAP_LENGTH);
int32_t* result = _ZZ_ROWMAP.get();

int32_t i = 0; // index in packed string
int32_t j = 0; // index in unpacked array
Expand All @@ -271,16 +274,15 @@ namespace Lucene

const int32_t* StandardTokenizerImpl::ZZ_ROWMAP()
{
static IntArray _ZZ_ROWMAP;
static boost::once_flag once = BOOST_ONCE_INIT;
boost:call_once(once, ZZ_ROWMAP_INIT, _ZZ_ROWMAP);
boost:call_once(once, ZZ_ROWMAP_INIT);
return _ZZ_ROWMAP.get();
}

void StandardTokenizerImpl::ZZ_TRANS_INIT(IntArray& zz_trans)
void StandardTokenizerImpl::ZZ_TRANS_INIT()
{
zz_trans = IntArray::newInstance(ZZ_TRANS_LENGTH);
int32_t* result = zz_trans.get();
_ZZ_TRANS = IntArray::newInstance(ZZ_TRANS_LENGTH);
int32_t* result = _ZZ_TRANS.get();

int32_t i = 0; // index in packed string
int32_t j = 0; // index in unpacked array
Expand All @@ -298,15 +300,14 @@ namespace Lucene
const int32_t* StandardTokenizerImpl::ZZ_TRANS()
{
static boost::once_flag once = BOOST_ONCE_INIT;
static IntArray _ZZ_TRANS;
boost::call_once(once, ZZ_TRANS_INIT, _ZZ_TRANS);
boost::call_once(once, ZZ_TRANS_INIT);
return _ZZ_TRANS.get();
}

void StandardTokenizerImpl::ZZ_ATTRIBUTE_INIT(IntArray& zz_attribute)
void StandardTokenizerImpl::ZZ_ATTRIBUTE_INIT()
{
zz_attribute = IntArray::newInstance(ZZ_ATTRIBUTE_LENGTH);
int32_t* result = zz_attribute.get();
_ZZ_ATTRIBUTE = IntArray::newInstance(ZZ_ATTRIBUTE_LENGTH);
int32_t* result = _ZZ_ATTRIBUTE.get();

int32_t i = 0; // index in packed string
int32_t j = 0; // index in unpacked array
Expand All @@ -323,8 +324,7 @@ namespace Lucene
const int32_t* StandardTokenizerImpl::ZZ_ATTRIBUTE()
{
static boost::once_flag once = BOOST_ONCE_INIT;
static IntArray _ZZ_ATTRIBUTE;
boost::call_once(once, ZZ_ATTRIBUTE_INIT, _ZZ_ATTRIBUTE);
boost::call_once(once, ZZ_ATTRIBUTE_INIT);
return _ZZ_ATTRIBUTE.get();
}

Expand Down