Merge branch 'insp3' into master.

6 files changed, 10 insertions, 8 deletions

diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index c0a5fcaee..17546d422 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -2,8 +2,8 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 John Brooks <special@inspircd.org>
diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h
index ad3c3ab45..6b0184bd4 100644
--- a/include/modules/ircv3_replies.h
+++ b/include/modules/ircv3_replies.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2019-2021 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/include/modules/regex.h b/include/modules/regex.h
index 2bf7763e6..e4915cbe2 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 26d67e1ee..7559ed237 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2015 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
  *
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 0328967df..546eb2835 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -4,7 +4,7 @@
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2019 B00mX0r <b00mx0r@aureus.pw>
  *   Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
- *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
diff --git a/include/modules/who.h b/include/modules/who.h
index e1f57d149..1913aeaeb 100644
--- a/include/modules/who.h
+++ b/include/modules/who.h
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018, 2021 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -51,8 +51,10 @@ class Who::EventListener : public Events::ModuleEventListener
 class Who::Request
 {
  public:
+	typedef std::bitset<UCHAR_MAX + 1> CharState;
+
 	/** The flags for matching users to include. */
-	std::bitset<UCHAR_MAX> flags;
+	CharState flags;
 
 	/** Whether we are matching using a wildcard or a flag. */
 	bool fuzzy_match = false;
@@ -67,7 +69,7 @@ class Who::Request
 	bool whox = false;
 
 	/** The fields to include in the WHOX response. */
-	std::bitset<UCHAR_MAX> whox_fields;
+	CharState whox_fields;
 
 	/** A user specified label for the WHOX response. */
 	std::string whox_querytype;