Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

This commit is contained in:
Akkadius 2020-05-24 01:37:10 -05:00
commit 630ab5e69d
3 changed files with 6 additions and 2 deletions

View File

@ -484,6 +484,9 @@ void Database::DeleteInstance(uint16 instance_id)
{ {
std::string query; std::string query;
query = StringFormat("DELETE FROM instance_list WHERE id=%u", instance_id);
QueryDatabase(query)
query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id); query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
QueryDatabase(query); QueryDatabase(query);

View File

@ -1,5 +1,6 @@
#include "uuid.h" #include "uuid.h"
#include <ios>
#include <fmt/format.h> #include <fmt/format.h>
#ifdef _WIN32 #ifdef _WIN32

View File

@ -2,7 +2,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <ios> #include <ostream>
namespace EQ namespace EQ
{ {