Clang fixes

anhstudios · Jun 17, 2013 · 9fc7004 · 9fc7004
1 parent 18fae63
commit 9fc7004
Show file tree

Hide file tree

Showing 30 changed files with 2,567 additions and 550 deletions.
diff --git a/src/swganh_core/CMakeLists.txt b/src/swganh_core/CMakeLists.txt
@@ -21,7 +21,7 @@ add_subdirectory(weather)
 add_custom_target(
     swgpy ALL
     DEPENDS
-        swgpy_app swgpy_command swgpy_chat swgpy_combat swgpy_object swgpy_social swgpy_simulation swgpy_utility
+        swgpy_app swgpy_command swgpy_chat swgpy_combat swgpy_object swgpy_simulation swgpy_utility
     COMMAND python "${CMAKE_SOURCE_DIR}/tools/swgpy/init_modules.py"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$\(Configuration\)/swgpy"
     VERBATIM

diff --git a/src/swganh_core/chat/chat_service.cc b/src/swganh_core/chat/chat_service.cc
@@ -332,9 +332,9 @@ void ChatService::Startup()
 		if(find_itr != online_players_.end())
 		{
 			//Send friend list update message
-			controller->Notify(&ChatFriendsListUpdate(galaxy_name_, real_event.second, 1));
+            ChatFriendsListUpdate update(galaxy_name_, real_event.second, 1);
+			controller->Notify(&update);
 		}
-
 	});
 
 	//When a player is removed from a friend's list
@@ -577,7 +577,8 @@ void ChatService::HandleFriendsList(const std::shared_ptr<swganh::object::Creatu
 		for_each(find_itr->second.begin(), find_itr->second.end(), 
 		[&] (const std::shared_ptr<swganh::observer::ObserverInterface>& id) {
 			//Send friend list update message
-			id->Notify(&ChatFriendsListUpdate(galaxy_name_, std::string(custom_name.begin(), custom_name.end()), operation));
+            ChatFriendsListUpdate friends_list(galaxy_name_, std::string(custom_name.begin(), custom_name.end()), operation);
+			id->Notify(&friends_list);
 		});
 	}
 
@@ -608,7 +609,8 @@ void ChatService::HandleFriendsList(const std::shared_ptr<swganh::object::Creatu
 			if(find_itr != online_players_.end())
 			{
 				//Send friend list update message
-				controller->Notify(&ChatFriendsListUpdate(galaxy_name_, friend_name, 1));
+                ChatFriendsListUpdate update(galaxy_name_, friend_name, 1);
+				controller->Notify(&update);
 			}
 		}
 		else
@@ -964,7 +966,9 @@ void ChatService::_handleRequestRoomList(
 			}
 			room_list.data.writeAt<uint32_t>(offset, count);
 		}
-		controller->Notify(&ChatServerStatus(1));
+
+        ChatServerStatus server_status(1);
+		controller->Notify(&server_status);
 		controller->Notify(&room_list);
 	}
 }
@@ -1034,7 +1038,8 @@ void ChatService::_handleSendToRoom(
 		}
 
 		//Send Status Message
-		controller->Notify(&ChatOnSendRoomMessage(error_code, message->message_counter));
+        ChatOnSendRoomMessage send_room_msg(error_code, message->message_counter);
+		controller->Notify(&send_room_msg);
 
 		if(error_code == 0)
 		{

diff --git a/src/swganh_core/object/cell/cell.cc b/src/swganh_core/object/cell/cell.cc
@@ -9,14 +9,22 @@ using namespace std;
 using namespace swganh::object;
 using namespace swganh::messages;
 
-void Cell::SetCell(uint32_t cell_number) { SetCell(cell_number, AcquireLock()); }
+void Cell::SetCell(uint32_t cell_number) {
+    auto lock = AcquireLock();
+    SetCell(cell_number, lock);
+}
+
 void Cell::SetCell(uint32_t cell_number, boost::unique_lock<boost::mutex>& lock) 
 {
 	generic_int_ = cell_number;
 	DISPATCH(Cell, Cell);
 }
 
-uint32_t Cell::GetCell() { return GetCell(AcquireLock()); }
+uint32_t Cell::GetCell() {
+    auto lock = AcquireLock();
+    return GetCell(lock);
+}
+
 uint32_t Cell::GetCell(boost::unique_lock<boost::mutex>& lock)
 {
 	return generic_int_;