From bc7fbcca167fc29e5c75518bc4f8992f6818612b Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Mon, 11 Apr 2011 20:45:18 -0300 Subject: [PATCH] fix gcc 4.4 compile error --- src/framework/ui/uiloader.cpp | 6 +++--- src/main.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/framework/ui/uiloader.cpp b/src/framework/ui/uiloader.cpp index 891aed8b..331e6dbf 100644 --- a/src/framework/ui/uiloader.cpp +++ b/src/framework/ui/uiloader.cpp @@ -31,7 +31,7 @@ UIElementPtr UILoader::createElementFromId(const std::string& id) UIElementPtr element; std::vector split; - boost::split(split, id, boost::is_any_of("#")); + boost::split(split, id, boost::is_any_of(std::string("#"))); if(split.size() != 2) return element; @@ -133,7 +133,7 @@ void UILoader::loadElements(const UIElementPtr& parent, const YAML::Node& node) // check if it's and element id if(id.find("#") != std::string::npos) { std::vector 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()); } } @@ -216,7 +216,7 @@ void UILoader::loadElementAnchor(const UIElementPtr& element, EAnchorType type, node >> anchorDescription; std::vector split; - boost::split(split, anchorDescription, boost::is_any_of(".")); + boost::split(split, anchorDescription, boost::is_any_of(std::string("."))); if(split.size() != 2) throw YAML::Exception(node.GetMark(), "invalid anchors description"); diff --git a/src/main.cpp b/src/main.cpp index 9d3e989f..729e1ae3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -113,8 +113,8 @@ int main(int argc, const char *argv[]) // state scope { - boost::shared_ptr initialState(new MenuState); - //boost::shared_ptr initialState(new TestState); + boost::scoped_ptr initialState(new MenuState); + //boost::scoped_ptr initialState(new TestState); g_dispatcher.addTask(boost::bind(&Engine::changeState, &g_engine, initialState.get())); Platform::showWindow();