aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/tokens.h
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2022-07-06 19:45:28 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2022-07-06 19:51:38 +0200
commit208fbc779c713715da1465a1a2c6710c084c9b05 (patch)
treef8698626e4c2fd65701eddf36918ebf4f2cc6763 /gcc/d/dmd/tokens.h
parentc785204735b2cace9a676969de0967105a06438d (diff)
downloadgcc-208fbc779c713715da1465a1a2c6710c084c9b05.zip
gcc-208fbc779c713715da1465a1a2c6710c084c9b05.tar.gz
gcc-208fbc779c713715da1465a1a2c6710c084c9b05.tar.bz2
d: Merge upstream dmd 56589f0f4, druntime 651389b5, phobos 1516ecad9.
D front-end changes: - Import latest bug fixes to mainline. D runtime changes: - Import latest bug fixes to mainline. Phobos changes: - Import latest bug fixes to mainline. gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 56589f0f4. libphobos/ChangeLog: * libdruntime/MERGE: Merge upstream druntime 651389b5. * src/MERGE: Merge upstream phobos 1516ecad9.
Diffstat (limited to 'gcc/d/dmd/tokens.h')
-rw-r--r--gcc/d/dmd/tokens.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/d/dmd/tokens.h b/gcc/d/dmd/tokens.h
index f9b6062..35fd68b 100644
--- a/gcc/d/dmd/tokens.h
+++ b/gcc/d/dmd/tokens.h
@@ -282,6 +282,7 @@ enum class TOK : unsigned char
cdecl_,
declspec,
stdcall,
+ pragma,
attribute__,
MAX,