From 119907f2386870e2b8ca1386475a473571e7c115 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 21 Apr 2020 11:40:26 +0100
Subject: Revert "Convert UserType to an enum class".

There's a bug in GCC with bitfields and enum class.

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51242

This reverts commit 44834a66a7e92c8979ae16421286c581a9cffbe9.
---
 src/users.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index d97f133c0..5837d2412 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -93,7 +93,7 @@ User::User(const std::string& uid, Server* srv, UserType type)
 		ServerInstance->Users.all_ulines.push_back(this);
 
 	// Do not insert FakeUsers into the uuidlist so FindUUID() won't return them which is the desired behavior
-	if (type != UserType::SERVER)
+	if (type != USERTYPE_SERVER)
 	{
 		if (!ServerInstance->Users.uuidlist.insert(std::make_pair(uuid, this)).second)
 			throw CoreException("Duplicate UUID in User constructor: " + uuid);
@@ -101,7 +101,7 @@ User::User(const std::string& uid, Server* srv, UserType type)
 }
 
 LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
-	: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, UserType::LOCAL)
+	: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL)
 	, eh(this)
 	, quitting_sendq(false)
 	, lastping(true)
@@ -118,7 +118,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
 }
 
 LocalUser::LocalUser(int myfd, const std::string& uid, Serializable::Data& data)
-	: User(uid, ServerInstance->FakeClient->server, UserType::LOCAL)
+	: User(uid, ServerInstance->FakeClient->server, USERTYPE_LOCAL)
 	, eh(this)
 {
 	eh.SetFd(myfd);
-- 
cgit v1.3.1-10-gc9f91