Browse Source

Apply ATOMIC_BEGIN/ATOMIC_END to change block, fixing logging macro

Josh Engebretson 9 years ago
parent
commit
64ab4315b9
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Source/Atomic/Resource/ResourceCache.cpp

+ 5 - 1
Source/Atomic/Resource/ResourceCache.cpp

@@ -711,6 +711,8 @@ SharedPtr<Resource> ResourceCache::GetTempResource(StringHash type, const String
         return SharedPtr<Resource>();
         return SharedPtr<Resource>();
     }
     }
 
 
+// ATOMIC BEGIN
+
     // Attempt to load the resource
     // Attempt to load the resource
     SharedPtr<File> file;
     SharedPtr<File> file;
 
 
@@ -723,7 +725,7 @@ SharedPtr<Resource> ResourceCache::GetTempResource(StringHash type, const String
         String ddsName = "DDS/" + name + ".dds";
         String ddsName = "DDS/" + name + ".dds";
         file = GetFile(ddsName, false);
         file = GetFile(ddsName, false);
         if (file)
         if (file)
-            LOGDEBUG("Loaded cached DDS " + name + ".dds");
+            ATOMIC_LOGDEBUG("Loaded cached DDS " + name + ".dds");
     }
     }
     if (!file)
     if (!file)
         file = GetFile(name, sendEventOnFailure);
         file = GetFile(name, sendEventOnFailure);
@@ -732,6 +734,8 @@ SharedPtr<Resource> ResourceCache::GetTempResource(StringHash type, const String
     file = GetFile(name, sendEventOnFailure);
     file = GetFile(name, sendEventOnFailure);
 #endif
 #endif
 
 
+// ATOMIC END
+
     if (!file)
     if (!file)
         return SharedPtr<Resource>();  // Error is already logged
         return SharedPtr<Resource>();  // Error is already logged