Explorar el Código

others

Signed-off-by: Esteban Papp <[email protected]>
Esteban Papp hace 4 años
padre
commit
a72b8a025f

+ 13 - 1
Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h

@@ -57,14 +57,26 @@ namespace AWSNativeSDKInit
         /**
         * Does a printf style output to the output stream. Don't use this, it's unsafe. See LogStream
         */
+#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
+        void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...) override;
+#else
         void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...);
+#endif
 
         /**
         * Writes the stream to the output stream.
         */
-        void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream);
+#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
+        void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream) override;
+#else
+        void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream& messageStream);
+#endif
 
+#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
+        void Flush() override;
+#else
         void Flush();
+#endif
 
     private:
         bool ShouldLog(Aws::Utils::Logging::LogLevel logLevel);

+ 1 - 1
Gems/Achievements/Code/Source/AchievementsSystemComponent.h

@@ -42,7 +42,7 @@ namespace Achievements
         ////////////////////////////////////////////////////////////////////////////////////////
         // AchievementsRequestBus interface implementation
         void UnlockAchievement(const UnlockAchievementParams& params) override;
-        void QueryAchievementDetails(const QueryAchievementParams& params);
+        void QueryAchievementDetails(const QueryAchievementParams& params) override;
     
     public:
         ////////////////////////////////////////////////////////////////////////////////////////

+ 1 - 1
Gems/Atom/RHI/Code/Include/Atom/RHI/FreeListAllocator.h

@@ -51,7 +51,7 @@ namespace AZ
             VirtualAddress Allocate(size_t byteCount, size_t byteAlignment) override;
             void DeAllocate(VirtualAddress allocation) override;
             void GarbageCollect() override;
-            void GarbageCollectForce();
+            void GarbageCollectForce() override;
             size_t GetAllocationCount() const override;
             size_t GetAllocatedByteCount() const override;
             const Descriptor& GetDescriptor() const override;

+ 1 - 1
Gems/Atom/RHI/Code/Include/Atom/RHI/PoolAllocator.h

@@ -51,7 +51,7 @@ namespace AZ
             VirtualAddress Allocate(size_t byteCount, size_t byteAlignment) override;
             void DeAllocate(VirtualAddress allocation) override;
             void GarbageCollect() override;
-            void GarbageCollectForce();
+            void GarbageCollectForce() override;
             size_t GetAllocationCount() const override;
             size_t GetAllocatedByteCount() const override;
             const Descriptor& GetDescriptor() const override;

+ 1 - 1
Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupPool.h

@@ -38,7 +38,7 @@ namespace AZ
             ResultCode InitGroup(ShaderResourceGroup& srg);
 
             //! Returns the descriptor passed at initialization time.
-            const ShaderResourceGroupPoolDescriptor& GetDescriptor() const;
+            const ShaderResourceGroupPoolDescriptor& GetDescriptor() const override;
 
             //! Returns the SRG layout used when initializing the pool.
             const ShaderResourceGroupLayout* GetLayout() const;