fix enum constant collision with define on windows
This commit is contained in:
@@ -30,7 +30,7 @@ namespace sourcetrail
|
|||||||
LOCAL_SYMBOL = 3,
|
LOCAL_SYMBOL = 3,
|
||||||
SIGNATURE = 4,
|
SIGNATURE = 4,
|
||||||
COMMENT = 5,
|
COMMENT = 5,
|
||||||
ERROR = 6,
|
INDEXER_ERROR = 6,
|
||||||
FULLTEXT_SEARCH = 7,
|
FULLTEXT_SEARCH = 7,
|
||||||
SCREEN_SEARCH = 8
|
SCREEN_SEARCH = 8
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace sourcetrail
|
|||||||
LocationKind::LOCAL_SYMBOL,
|
LocationKind::LOCAL_SYMBOL,
|
||||||
LocationKind::SIGNATURE,
|
LocationKind::SIGNATURE,
|
||||||
LocationKind::COMMENT,
|
LocationKind::COMMENT,
|
||||||
LocationKind::ERROR,
|
LocationKind::INDEXER_ERROR,
|
||||||
LocationKind::FULLTEXT_SEARCH,
|
LocationKind::FULLTEXT_SEARCH,
|
||||||
LocationKind::SCREEN_SEARCH
|
LocationKind::SCREEN_SEARCH
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -584,7 +584,7 @@ namespace sourcetrail
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
const int errorId = m_storage->addError(StorageErrorData(message, "", fatal, true));
|
const int errorId = m_storage->addError(StorageErrorData(message, "", fatal, true));
|
||||||
addSourceLocation(errorId, location, LocationKind::ERROR);
|
addSourceLocation(errorId, location, LocationKind::INDEXER_ERROR);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
catch (const SourcetrailException e)
|
catch (const SourcetrailException e)
|
||||||
|
|||||||
+1
-1
@@ -514,7 +514,7 @@ namespace sourcetrail
|
|||||||
|
|
||||||
const std::vector<StorageSourceLocation> sourceLocations = storage->getAll<StorageSourceLocation>();
|
const std::vector<StorageSourceLocation> sourceLocations = storage->getAll<StorageSourceLocation>();
|
||||||
REQUIRE(sourceLocations.size() == 1);
|
REQUIRE(sourceLocations.size() == 1);
|
||||||
REQUIRE(sourceLocations.front().locationKind == locationKindToInt(LocationKind::ERROR));
|
REQUIRE(sourceLocations.front().locationKind == locationKindToInt(LocationKind::INDEXER_ERROR));
|
||||||
REQUIRE(sourceLocations.front().startLineNumber == startLine);
|
REQUIRE(sourceLocations.front().startLineNumber == startLine);
|
||||||
REQUIRE(sourceLocations.front().startColumnNumber == startCol);
|
REQUIRE(sourceLocations.front().startColumnNumber == startCol);
|
||||||
REQUIRE(sourceLocations.front().endLineNumber == endLine);
|
REQUIRE(sourceLocations.front().endLineNumber == endLine);
|
||||||
|
|||||||
Reference in New Issue
Block a user