summaryrefslogtreecommitdiff
path: root/alphabetparameters.h
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2023-07-17 15:49:09 -0500
committerJohn Fultz <jfultz@wolfram.com>2023-07-17 16:20:01 -0500
commit3b9e9b6df1d124b29bfd3715b6cb12cdee18b2ea (patch)
tree9ee43ed8bc403f7f9b444ecb505dbcd5afb11d75 /alphabetparameters.h
parent741ba7f9223071da84146069851b48d2344ac03e (diff)
Fix up std:: namespace hygiene.
* Remove all uses of `using namespace std` from header files (although a few specific cases of things like `using std::vector` remain) * Move all existing uses of `using namespace std` in cpp files to after the header includes * Make coordinating changes so it builds again. Qt6 builds on Windows were breaking because of namespace collision between std::byte and some version of `byte` in one of Qt's namespaces. That breakage is now fixed. It would be good to systematically clean up all `using` declarations in header files to ensure nothing is leaking out, but that's for another time.
Diffstat (limited to 'alphabetparameters.h')
-rw-r--r--alphabetparameters.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/alphabetparameters.h b/alphabetparameters.h
index 26e332e..bfbf00a 100644
--- a/alphabetparameters.h
+++ b/alphabetparameters.h
@@ -25,7 +25,7 @@
#include "fixedstring.h"
#include "uv.h"
-using namespace std;
+using std::string;
#define QUACKLE_MAXIMUM_ALPHABET_SIZE 55
#define QUACKLE_MINIMUM_ALPHABET_SIZE 1
@@ -213,7 +213,7 @@ inline void LetterParameter::setVowel(bool isVowel)
m_isVowel = isVowel;
}
-typedef vector<LetterParameter> Alphabet;
+typedef std::vector<LetterParameter> Alphabet;
class AlphabetParameters
{
@@ -290,7 +290,7 @@ protected:
int m_length;
Alphabet m_alphabet;
- typedef map<UVString, int> LetterLookupMap;
+ typedef std::map<UVString, int> LetterLookupMap;
LetterLookupMap m_letterLookup;
string m_alphabetName;