Browse files

Merge branch 't/cs_pysource' of github.com:nzinfo/csft into t/cs_pyso…

…urce

Conflicts:
	src/py_source.cpp
  • Loading branch information...
2 parents c41349d + f9946a3 commit 913e0b2e73c1991ed3473a90af992a777ead003e @nzinfo committed Apr 8, 2012
Showing with 2,090 additions and 2,097 deletions.
  1. +2,088 −2,096 src/py_source.cpp
  2. +1 −1 src/sphinx.cpp
  3. +1 −0 src/sphinx.h
View
4,184 src/py_source.cpp
2,088 additions, 2,096 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 src/sphinx.cpp
@@ -20201,7 +20201,7 @@ BYTE* CSphSource_Document::GetField ( int iFieldIndex)
}
-static int sphAddMva64 ( CSphVector<DWORD> & dStorage, uint64_t uVal )
+int sphAddMva64 ( CSphVector<DWORD> & dStorage, uint64_t uVal )
{
int uOff = dStorage.GetLength();
dStorage.Resize ( uOff+2 );
View
1 src/sphinx.h
@@ -1586,6 +1586,7 @@ enum ESphOnFileFieldError
FFE_FAIL_INDEX
};
+int sphAddMva64 ( CSphVector<DWORD> & dStorage, uint64_t uVal ); //forward declare.
/// generic document source
/// provides multi-field support and generic tokenizer

0 comments on commit 913e0b2

Please sign in to comment.