diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-16 22:25:22 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-16 22:25:22 (GMT) |
| commit | d368108255c3bfe8bdd0d96414b293a5a767f82a (patch) | |
| tree | f079b1f2e75982dd6996c9199ccd7a775b76a7d0 | |
| parent | d8dc46cc000d81d031c5f08806dc26a3b433e1bf (diff) | |
| download | uscxml-d368108255c3bfe8bdd0d96414b293a5a767f82a.zip uscxml-d368108255c3bfe8bdd0d96414b293a5a767f82a.tar.gz uscxml-d368108255c3bfe8bdd0d96414b293a5a767f82a.tar.bz2 | |
Build fixes for gcc
| -rw-r--r-- | src/uscxml/URL.cpp | 1 | ||||
| -rw-r--r-- | src/uscxml/concurrency/EventBase.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/uscxml/URL.cpp b/src/uscxml/URL.cpp index 624f6c1..79a3f65 100644 --- a/src/uscxml/URL.cpp +++ b/src/uscxml/URL.cpp @@ -354,6 +354,7 @@ const std::string URLImpl::file() const { if (_pathComponents.size() > 0 && !boost::ends_with(path(), "/")) { return _pathComponents[_pathComponents.size() - 1]; } + return ""; } const void URLImpl::download(bool blocking) { diff --git a/src/uscxml/concurrency/EventBase.cpp b/src/uscxml/concurrency/EventBase.cpp index b5c1308..ec25181 100644 --- a/src/uscxml/concurrency/EventBase.cpp +++ b/src/uscxml/concurrency/EventBase.cpp @@ -27,7 +27,7 @@ tthread::recursive_mutex EventBase::_instanceMutex; boost::shared_ptr<EventBase> EventBase::get(const std::string& name) { tthread::lock_guard<tthread::recursive_mutex> lock(_instanceMutex); - std::map<std::string, boost::weak_ptr<EventBase> >::const_iterator instIter = _eventBases.begin(); + std::map<std::string, boost::weak_ptr<EventBase> >::iterator instIter = _eventBases.begin(); while(instIter != _eventBases.end()) { if (!instIter->second.lock()) { _eventBases.erase(instIter++); |