Integrate C++11 branch into 5_1-new

2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
@@ -203,7 +203,7 @@ public:
 	 *
 	 * This used to call Unset() to do the same thing. */
 	SongID(): sDir(""), m_Cache() { m_Cache.Unset(); }
-	void Unset() { FromSong(NULL); }
+	void Unset() { FromSong(nullptr); }
 	void FromSong( const Song *p );
 	Song *ToSong() const;
 	bool operator<( const SongID &other ) const