Permalink
Browse files

Merge pull request #519 from J-N/develop

Merging in these changes as they look good.
  • Loading branch information...
2 parents 1141f69 + 8e06fb7 commit b66595cd138037e2ea8ca62f99738cad7bc5f9cb @rcythr rcythr committed Mar 1, 2013
View
@@ -88,6 +88,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(AdditionalBoostLibs chrono regex)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-virtual-dtor")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-parentheses")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type")
+
find_library(PTHREAD_LIBRARY NAMES pthread)
endif()
@@ -123,4 +123,4 @@ bool iff_file::isFolderNode_(std::string& name)
return true;
}
return false;
-}
+}
@@ -17,10 +17,11 @@ ResourceManager::ResourceManager(std::shared_ptr<TreArchive> archive)
void ResourceManager::LoadResourceByName(const std::string& name, std::shared_ptr<VisitorInterface> type, bool is_cached)
{
- iff_file::loadIFF(archive_->GetResource(name), type);
+ auto resource = archive_->GetResource(name);
+ iff_file::loadIFF(resource, type);
if(is_cached)
{
boost::lock_guard<boost::mutex> lock(resource_mutex_);
loadedResources_.insert(ResourceCache::value_type(name, type));
}
-}
+}
@@ -1,7 +1,7 @@
// This file is part of SWGANH which is released under the MIT license.
// See file LICENSE or go to http://swganh.com/LICENSE
#pragma once
-
+#include<stdexcept>
namespace swganh
{
namespace tre
@@ -200,7 +200,7 @@ class Object :
template<typename T>
void NotifyObservers(swganh::messages::BaseBaselinesMessage* message)
{
- if (! (message.view_type == 3 || message.view_type == 6))
+ if (! (message->view_type == 3 || message->view_type == 6))
{
if (HasController())
{

0 comments on commit b66595c

Please sign in to comment.