utils/Vector: add "constexpr"

zag2me · May 29, 2018 · 5d3815f · 5d3815f
1 parent 1105746
commit 5d3815f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/xbmc/utils/Vector.cpp b/xbmc/utils/Vector.cpp
@@ -22,21 +22,6 @@
 
 #include "Vector.h"
 
-CVector::CVector(float xCoord, float yCoord)
-  : x(xCoord),
-    y(yCoord)
-{ }
-
-const CVector CVector::operator+(const CVector &other) const
-{
-  return CVector(x + other.x, y + other.y);
-}
-
-const CVector CVector::operator-(const CVector &other) const
-{
-  return CVector(x - other.x, y - other.y);
-}
-
 CVector& CVector::operator+=(const CVector &other)
 {
   x += other.x;
@@ -53,11 +38,6 @@ CVector& CVector::operator-=(const CVector &other)
   return *this;
 }
 
-float CVector::scalar(const CVector &other) const
-{
-  return x * other.x + y * other.y;
-}
-
 float CVector::length() const
 {
   return sqrt(pow(x, 2) + pow(y, 2));

diff --git a/xbmc/utils/Vector.h b/xbmc/utils/Vector.h
@@ -23,14 +23,26 @@ class CVector
 {
 public:
   CVector() = default;
-  CVector(float xCoord, float yCoord);
+  constexpr CVector(float xCoord, float yCoord):x(xCoord), y(yCoord) {}
 
-  const CVector operator+(const CVector &other) const;
-  const CVector operator-(const CVector &other) const;
+  constexpr CVector operator+(const CVector &other) const
+  {
+    return CVector(x + other.x, y + other.y);
+  }
+
+  constexpr CVector operator-(const CVector &other) const
+  {
+    return CVector(x - other.x, y - other.y);
+  }
+
   CVector& operator+=(const CVector &other);
   CVector& operator-=(const CVector &other);
 
-  float scalar(const CVector &other) const;
+  constexpr float scalar(const CVector &other) const
+  {
+    return x * other.x + y * other.y;
+  }
+
   float length() const;
 
   float x = 0;