Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Develop #519

Merged
merged 5 commits into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 25, 2013
  1. @J-N
  2. @J-N

    fix for deconstructor

    J-N authored
  3. @J-N

    fixes for linux tmp reference

    J-N authored
  4. @J-N

    fix for wrong referncing

    J-N authored
Commits on Feb 26, 2013
  1. @J-N

    fix for linux error

    J-N authored
This page is out of date. Refresh to see the latest.
View
4 CMakeLists.txt
@@ -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()
View
2  src/swganh/tre/iff/iff.cc
@@ -123,4 +123,4 @@ bool iff_file::isFolderNode_(std::string& name)
return true;
}
return false;
-}
+}
View
5 src/swganh/tre/resource_manager.cc
@@ -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));
}
-}
+}
View
2  src/swganh/tre/visitors/objects/object_visitor-intl.h
@@ -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
View
2  src/swganh_core/object/object.h
@@ -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())
{
Something went wrong with that request. Please try again.