fix gcc 4.4 compile error
This commit is contained in:
parent
83b166e91e
commit
bc7fbcca16
|
@ -31,7 +31,7 @@ UIElementPtr UILoader::createElementFromId(const std::string& id)
|
||||||
UIElementPtr element;
|
UIElementPtr element;
|
||||||
|
|
||||||
std::vector<std::string> split;
|
std::vector<std::string> split;
|
||||||
boost::split(split, id, boost::is_any_of("#"));
|
boost::split(split, id, boost::is_any_of(std::string("#")));
|
||||||
if(split.size() != 2)
|
if(split.size() != 2)
|
||||||
return element;
|
return element;
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ void UILoader::loadElements(const UIElementPtr& parent, const YAML::Node& node)
|
||||||
// check if it's and element id
|
// check if it's and element id
|
||||||
if(id.find("#") != std::string::npos) {
|
if(id.find("#") != std::string::npos) {
|
||||||
std::vector<std::string> split;
|
std::vector<std::string> split;
|
||||||
boost::split(split, id, boost::is_any_of("#"));
|
boost::split(split, id, boost::is_any_of(std::string("#")));
|
||||||
loadElements(container->getChildById(split[1]), it.second());
|
loadElements(container->getChildById(split[1]), it.second());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -216,7 +216,7 @@ void UILoader::loadElementAnchor(const UIElementPtr& element, EAnchorType type,
|
||||||
node >> anchorDescription;
|
node >> anchorDescription;
|
||||||
|
|
||||||
std::vector<std::string> split;
|
std::vector<std::string> split;
|
||||||
boost::split(split, anchorDescription, boost::is_any_of("."));
|
boost::split(split, anchorDescription, boost::is_any_of(std::string(".")));
|
||||||
if(split.size() != 2)
|
if(split.size() != 2)
|
||||||
throw YAML::Exception(node.GetMark(), "invalid anchors description");
|
throw YAML::Exception(node.GetMark(), "invalid anchors description");
|
||||||
|
|
||||||
|
|
|
@ -113,8 +113,8 @@ int main(int argc, const char *argv[])
|
||||||
|
|
||||||
// state scope
|
// state scope
|
||||||
{
|
{
|
||||||
boost::shared_ptr<MenuState> initialState(new MenuState);
|
boost::scoped_ptr<MenuState> initialState(new MenuState);
|
||||||
//boost::shared_ptr<TestState> initialState(new TestState);
|
//boost::scoped_ptr<TestState> initialState(new TestState);
|
||||||
g_dispatcher.addTask(boost::bind(&Engine::changeState, &g_engine, initialState.get()));
|
g_dispatcher.addTask(boost::bind(&Engine::changeState, &g_engine, initialState.get()));
|
||||||
|
|
||||||
Platform::showWindow();
|
Platform::showWindow();
|
||||||
|
|
Loading…
Reference in New Issue