ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data: windows crash fix

Browse Source 
* fixed a crash on windows that occurred when the name of a token was stored in a container that was destroyed after a const & was returned.
This commit is contained in:
malte_langkabel
2014-10-06 11:18:27 +02:00
parent a294519cd1
commit 0f34f55844
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ void GraphController::handleMessage(MessageActivateToken* message)
void GraphController::handleMessage(MessageActivateTokens* message)
{
createDummyGraphForTokenId(message->tokenIds[0], &GraphLayouter::layoutSimpleRing);
//createDummyGraphForTokenId(message->tokenIds[0], &GraphLayouter::layoutSimpleRing);
}
GraphView* GraphController::getView()
src/lib/data/graph/Node.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ bool Node::isType(NodeTypeMask mask) const
return (m_type & mask) > 0;
}
const std::string& Node::getName() const
std::string Node::getName() const
{
return m_nameComponent->getName();
}
src/lib/data/graph/Node.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
void setType(NodeType type);
bool isType(NodeTypeMask mask) const;
const std::string& getName() const;
std::string getName() const;
std::string getFullName() const;
const std::vector<Edge*>& getEdges() const;
src/lib/data/graph/token_component/TokenComponentName.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ std::shared_ptr<TokenComponent> TokenComponentNameReferenced::copy() const
return std::make_shared<TokenComponentNameCached>(getFullName());
}
const std::string& TokenComponentNameReferenced::getName() const
std::string TokenComponentNameReferenced::getName() const
{
return m_searchNode->getName();
}
@@ -55,7 +55,7 @@ std::shared_ptr<TokenComponent> TokenComponentNameCached::copy() const
return std::make_shared<TokenComponentNameCached>(m_fullName);
}
const std::string& TokenComponentNameCached::getName() const
std::string TokenComponentNameCached::getName() const
{
return utility::split(m_fullName, SearchIndex::DELIMITER).back();
}
src/lib/data/graph/token_component/TokenComponentName.h
+3 -3
View File
@@ -15,7 +15,7 @@ public:
std::shared_ptr<TokenComponentName> copyComponentName() const;
virtual const std::string& getName() const = 0;
virtual std::string getName() const = 0;
virtual std::string getFullName() const = 0;
};
@@ -29,7 +29,7 @@ public:
virtual std::shared_ptr<TokenComponent> copy() const;
virtual const std::string& getName() const;
virtual std::string getName() const;
virtual std::string getFullName() const;
private:
@@ -46,7 +46,7 @@ public:
virtual std::shared_ptr<TokenComponent> copy() const;
virtual const std::string& getName() const;
virtual std::string getName() const;
virtual std::string getFullName() const;
private: