Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build fixups for Visual Studio 2015 #95

Merged
merged 2 commits into from
Feb 13, 2021
Merged

Build fixups for Visual Studio 2015 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14260c4
Build fixups for Visual Studio 2015 and 2017
nigels-com Feb 11, 2021
791586e
Merge branch 'master' into fixups-visual-studio
cary-ilm Feb 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Imath/ImathPlane.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ template <class T> class Plane3
/// @name Constructors

/// Uninitialized by default
IMATH_HOSTDEVICE constexpr Plane3() noexcept {}
IMATH_HOSTDEVICE Plane3() noexcept {}

/// Initialize with a normal and distance
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 Plane3 (const Vec3<T>& normal, T distance) noexcept;
Expand Down
8 changes: 4 additions & 4 deletions src/Imath/ImathVec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ template <class T> class Vec3
/// @name Constructors and Assignment

/// Uninitialized by default
IMATH_HOSTDEVICE constexpr Vec3() noexcept;
IMATH_HOSTDEVICE Vec3() noexcept;

/// Initialize to a scalar `(a,a,a)`
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 explicit Vec3 (T a) noexcept;
Expand Down Expand Up @@ -503,7 +503,7 @@ template <class T> class Vec4
/// @name Constructors and Assignment

/// Uninitialized by default
IMATH_HOSTDEVICE constexpr Vec4() noexcept; // no initialization
IMATH_HOSTDEVICE Vec4() noexcept; // no initialization

/// Initialize to a scalar `(a,a,a,a)`
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 explicit Vec4 (T a) noexcept; // (a a a a)
Expand Down Expand Up @@ -1207,7 +1207,7 @@ Vec3<T>::operator[] (int i) const noexcept
return (&x)[i]; // NOSONAR - suppress SonarCloud bug report.
}

template <class T> constexpr inline Vec3<T>::Vec3() noexcept
template <class T> inline Vec3<T>::Vec3() noexcept
{
// empty
}
Expand Down Expand Up @@ -1680,7 +1680,7 @@ Vec4<T>::operator[] (int i) const noexcept
return (&x)[i]; // NOSONAR - suppress SonarCloud bug report.
}

template <class T> constexpr inline Vec4<T>::Vec4() noexcept
template <class T> inline Vec4<T>::Vec4() noexcept
{
// empty
}
Expand Down