Merge branch 'master' into dev

Author: braindigitalis

include/dpp/discordvoiceclient.h

@@ -369,7 +369,7 @@ class DPP_EXPORT discord_voice_client : public websocket_client
 	 * @param severity The log level from dpp::loglevel
 	 * @param msg The log message to output
 	 */
-	virtual void log(dpp::loglevel severity, const std::string &msg);
+	virtual void log(dpp::loglevel severity, const std::string &msg) const;
 
 	/** Fires every second from the underlying socket I/O loop, used for sending heartbeats */
 	virtual void one_second_timer();

src/dpp/discordvoiceclient.cpp

@@ -630,7 +630,7 @@ void discord_voice_client::Error(uint32_t errorcode)
 	}
 }
 
-void discord_voice_client::log(dpp::loglevel severity, const std::string &msg)
+void discord_voice_client::log(dpp::loglevel severity, const std::string &msg) const
 {
 	creator->log(severity, msg);
 }