Преглед изворни кода

Fix signed-unsigned conversion warnings that leak into applications using Urho when doing Win64 build.

Stinkfist0 пре 11 година
родитељ
комит
03f6cb137b
1 измењених фајлова са 6 додато и 6 уклоњено
  1. 6 6
      Source/Urho3D/Container/Vector.h

+ 6 - 6
Source/Urho3D/Container/Vector.h

@@ -214,7 +214,7 @@ public:
         unsigned pos = dest - Begin();
         if (pos > size_)
             pos = size_;
-        unsigned length = end - start;
+        unsigned length = static_cast<unsigned>(end - start);
         Resize(size_ + length, 0);
         MoveRange(pos + length, pos, size_ - pos - length);
         
@@ -231,7 +231,7 @@ public:
         unsigned pos = dest - Begin();
         if (pos > size_)
             pos = size_;
-        unsigned length = end - start;
+        unsigned length = static_cast<unsigned>(end - start);
         Resize(size_ + length, 0);
         MoveRange(pos + length, pos, size_ - pos - length);
         
@@ -270,7 +270,7 @@ public:
         unsigned pos = start - Begin();
         if (pos >= size_)
             return End();
-        unsigned length = end - start;
+        unsigned length = static_cast<unsigned>(end - start);
         Erase(pos, length);
         
         return Begin() + pos;
@@ -651,7 +651,7 @@ public:
         unsigned pos = dest - Begin();
         if (pos > size_)
             pos = size_;
-        unsigned length = end - start;
+        unsigned length = static_cast<unsigned>(end - start);
         Resize(size_ + length);
         MoveRange(pos + length, pos, size_ - pos - length);
         CopyElements(Buffer() + pos, &(*start), length);
@@ -665,7 +665,7 @@ public:
         unsigned pos = dest - Begin();
         if (pos > size_)
             pos = size_;
-        unsigned length = end - start;
+        unsigned length = static_cast<unsigned>(end - start);
         Resize(size_ + length);
         MoveRange(pos + length, pos, size_ - pos - length);
         
@@ -704,7 +704,7 @@ public:
         unsigned pos = start - Begin();
         if (pos >= size_)
             return End();
-        unsigned length = end - start;
+        unsigned length = static_cast<unsigned>(end - start);
         Erase(pos, length);
         
         return Begin() + pos;