Add the new header to relevant files

CleverRaven · Jun 30, 2016 · 6446e5d · 6446e5d
1 parent 81f0b9a
commit 6446e5d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CataclysmWin.cbp b/CataclysmWin.cbp
@@ -389,6 +389,7 @@
 		<Unit filename="src/coordinate_conversions.cpp" />
 		<Unit filename="src/coordinate_conversions.h" />
 		<Unit filename="src/coordinates.h" />
+		<Unit filename="src/copyable_unique_ptr.h" />
 		<Unit filename="src/craft_command.cpp" />
 		<Unit filename="src/craft_command.h" />
 		<Unit filename="src/crafting.cpp" />

diff --git a/astyled_whitelist b/astyled_whitelist
@@ -101,6 +101,7 @@ src/computer.h
 src/construction.h
 src/coordinate_conversions.h
 src/coordinates.h
+src/copyable_unique_ptr.h
 src/craft_command.h
 src/crafting_gui.h
 src/creature_tracker.h

diff --git a/msvc-full-features/Cataclysm.vcxproj b/msvc-full-features/Cataclysm.vcxproj
@@ -234,6 +234,7 @@
     <ClInclude Include="..\src\construction.h" />
     <ClInclude Include="..\src\coordinates.h" />
     <ClInclude Include="..\src\coordinate_conversions.h" />
+    <ClInclude Include="..\src\copyable_unique_ptr.h" />
     <ClInclude Include="..\src\crafting.h" />
     <ClInclude Include="..\src\crafting_gui.h" />
     <ClInclude Include="..\src\craft_command.h" />
@@ -551,4 +552,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/src/copyable_unique_ptr.h b/src/copyable_unique_ptr.h
@@ -4,15 +4,16 @@
 #include <memory>
 
 template <typename T>
-class copyable_unique_ptr : public std::unique_ptr<T> {
+class copyable_unique_ptr : public std::unique_ptr<T>
+{
     public:
         copyable_unique_ptr() = default;
-        copyable_unique_ptr( copyable_unique_ptr&& rhs ) = default;
+        copyable_unique_ptr( copyable_unique_ptr &&rhs ) = default;
 
-        copyable_unique_ptr( const copyable_unique_ptr<T>& rhs )
+        copyable_unique_ptr( const copyable_unique_ptr<T> &rhs )
             : std::unique_ptr<T>( rhs ? new T( *rhs ) : nullptr ) {}
 
-        copyable_unique_ptr &operator=( const copyable_unique_ptr<T>& rhs ) {
+        copyable_unique_ptr &operator=( const copyable_unique_ptr<T> &rhs ) {
             std::unique_ptr<T>::reset( rhs ? new T( *rhs ) : nullptr );
             return *this;
         }

diff --git a/src/init.cpp b/src/init.cpp
@@ -333,7 +333,6 @@ void DynamicDataLoader::finalize_loaded_data()
     MonsterGenerator::generator().finalize_mtypes();
     MonsterGroupManager::FinalizeMonsterGroups();
     monfactions::finalize();
-    requirement_data::finalize();
     finalize_recipes();
     finialize_martial_arts();
     finalize_constructions();