diff --git a/src/NoteData.h b/src/NoteData.h
index 1ed6873876..e6b7f2d755 100644
--- a/src/NoteData.h
+++ b/src/NoteData.h
@@ -386,10 +386,7 @@ public:
 /** @brief Allow a quick way to swap notedata. */
 namespace std
 {
-	template<> inline void swap<NoteData>( NoteData &nd1, NoteData &nd2 )
-#if !defined(_MSC_VER)
-	noexcept(is_nothrow_move_constructible<NoteData>::value && is_nothrow_move_assignable<NoteData>::value)
-#endif
+	template<> inline void swap<NoteData>( NoteData &nd1, NoteData &nd2 ) noexcept
 	{
 		nd1.swap( nd2 );
 	}