Ticket #2669: Clang_Patches.diff

source/tools/atlas/AtlasObject/AtlasObjectImpl.h

@@ -59 +59 @@
 
     std::wstring value;
 
-    typedef std::multimap<const std::string, const AtNode::Ptr> child_maptype;
-    typedef std::pair<const std::string, const AtNode::Ptr> child_pairtype;
+    typedef std::multimap<std::string, AtNode::Ptr> child_maptype;
+    typedef std::pair<std::string, AtNode::Ptr> child_pairtype;
 
     child_maptype children;
 

source/tools/atlas/GameInterface/Messages.h

@@ -438 +438 @@
 #ifndef MESSAGES_SKIP_STRUCTS
 struct sEnvironmentSettings
 {
+    // Workaround for a bug in the clang compiler: http://llvm.org/bugs/show_bug.cgi?id=16042
+    // TODO: Can be removed when the bug is fixed in all supported versions of clang.
+    sEnvironmentSettings& operator= (const sEnvironmentSettings&) = default;
+    
     Shareable<std::wstring> watertype; // range 0..1 corresponds to min..max terrain height; out-of-bounds values allowed
     Shareable<float> waterheight; // range 0..1 corresponds to min..max terrain height; out-of-bounds values allowed
     Shareable<float> waterwaviness; // range ???