diff --git a/common/eqemu_exception.cpp b/common/eqemu_exception.cpp index 8d6a7c7a3..47f023e6f 100644 --- a/common/eqemu_exception.cpp +++ b/common/eqemu_exception.cpp @@ -35,7 +35,8 @@ namespace EQEmu name_(e.name_) { } - + +#ifdef EQEMU_RVALUE_MOVE Exception::Exception(const Exception&& e) : line_(e.line_), file_(e.file_), @@ -43,6 +44,7 @@ namespace EQEmu name_(e.name_) { } +#endif void Exception::operator=(const Exception& e) { line_ = e.line_; diff --git a/common/eqemu_exception.h b/common/eqemu_exception.h index 7c14645c7..cf6ede925 100644 --- a/common/eqemu_exception.h +++ b/common/eqemu_exception.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,9 @@ namespace EQEmu Exception(const Exception& e); //! Move Constructor +#ifdef EQEMU_RVALUE_MOVE Exception(const Exception&& e); +#endif //! Destructor ~Exception() throw() { } diff --git a/common/fixed_memory_hash_set.h b/common/fixed_memory_hash_set.h index eaa872756..3a8525bf2 100644 --- a/common/fixed_memory_hash_set.h +++ b/common/fixed_memory_hash_set.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -108,6 +108,7 @@ namespace EQEmu { } //! RValue-Move Constructor +#ifdef EQEMU_RVALUE_MOVE FixedMemoryHashSet(FixedMemoryHashSet&& other) : data_(other.data_), size_(other.size_), @@ -118,6 +119,7 @@ namespace EQEmu { elements_(other.elements_) { } +#endif //! Destructor ~FixedMemoryHashSet() { diff --git a/common/ipc_mutex.cpp b/common/ipc_mutex.cpp index c5c232be2..dcc39878a 100644 --- a/common/ipc_mutex.cpp +++ b/common/ipc_mutex.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/common/ipc_mutex.h b/common/ipc_mutex.h index 6fd69a7be..1e11325a6 100644 --- a/common/ipc_mutex.h +++ b/common/ipc_mutex.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/common/memory_mapped_file.cpp b/common/memory_mapped_file.cpp index 1565058e4..b045c9422 100644 --- a/common/memory_mapped_file.cpp +++ b/common/memory_mapped_file.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/common/memory_mapped_file.h b/common/memory_mapped_file.h index af7c2e961..9ced423ec 100644 --- a/common/memory_mapped_file.h +++ b/common/memory_mapped_file.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/common/shareddb.cpp b/common/shareddb.cpp index aa8a4a367..593abec4d 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -1895,4 +1895,4 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { _log(SPELLS__LOAD_ERR, "Error in LoadSpells query '%s' %s", query, errbuf); safe_delete_array(query); } -} \ No newline at end of file +} diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index 0e15ec9f8..0e5305452 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/shared_memory/spells.cpp b/shared_memory/spells.cpp index a77d81b3c..0b91e101f 100644 --- a/shared_memory/spells.cpp +++ b/shared_memory/spells.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,6 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "spells.h" #include "../common/debug.h" #include "../common/shareddb.h" diff --git a/shared_memory/spells.h b/shared_memory/spells.h index 2ad615e4b..03ef75282 100644 --- a/shared_memory/spells.h +++ b/shared_memory/spells.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/fixed_memory_test.h b/tests/fixed_memory_test.h index 7cb579c6c..0e9b49962 100644 --- a/tests/fixed_memory_test.h +++ b/tests/fixed_memory_test.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/ipc_mutex_test.h b/tests/ipc_mutex_test.h index f94a342a1..03d4cc4ea 100644 --- a/tests/ipc_mutex_test.h +++ b/tests/ipc_mutex_test.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/main.cpp b/tests/main.cpp index 2d09c32e5..feb687153 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/memory_mapped_file_test.h b/tests/memory_mapped_file_test.h index 3ecdb30ff..46a3d87ae 100644 --- a/tests/memory_mapped_file_test.h +++ b/tests/memory_mapped_file_test.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by