Merge "Ensure BaseHandle class move noexcept (core public-api)" into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / rendering / texture-set.cpp

diff --git a/dali/public-api/rendering/texture-set.cpp b/dali/public-api/rendering/texture-set.cpp
index 6f9fa6b..c045862 100644 (file)
--- a/dali/public-api/rendering/texture-set.cpp
+++ b/dali/public-api/rendering/texture-set.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,9 @@ TextureSet TextureSet::DownCast(BaseHandle handle)
 
 TextureSet& TextureSet::operator=(const TextureSet& handle) = default;
 
-TextureSet::TextureSet(TextureSet&& rhs) = default;
+TextureSet::TextureSet(TextureSet&& rhs) noexcept = default;
 
-TextureSet& TextureSet::operator=(TextureSet&& rhs) = default;
+TextureSet& TextureSet::operator=(TextureSet&& rhs) noexcept = default;
 
 void TextureSet::SetTexture(size_t index, Texture texture)
 {
@@ -86,7 +86,7 @@ Sampler TextureSet::GetSampler(size_t index) const
   return Dali::Sampler(samplerPtr);
 }
 
-size_t TextureSet::GetTextureCount() const
+uint32_t TextureSet::GetTextureCount() const
 {
   return GetImplementation(*this).GetTextureCount();
 }