summaryrefslogtreecommitdiff
path: root/src/parser.h
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@colm.net>2019-09-08 20:50:12 -0600
committerAdrian Thurston <thurston@colm.net>2019-09-08 20:50:12 -0600
commita90aad94da641125a47de44a3f7552df8d861bee (patch)
tree243b8259f0f1338af21b1666cf4fd9b7be5f81b7 /src/parser.h
parentcf1179fca1bf8c3454730918f149c17c13f49cdc (diff)
downloadcolm-a90aad94da641125a47de44a3f7552df8d861bee.tar.gz
merging aapl src dirs: added CmpStr and CmpString to colm/aapl
CmpStr is defined in colm/*.h so we need to also move it aside when we add it to aapl. With this commit there are no more diffs between the aapl src dirs, with the exception of a three files added to the aapl-repos package. Will use this as the definitive version.
Diffstat (limited to 'src/parser.h')
-rw-r--r--src/parser.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/parser.h b/src/parser.h
index 97f2ede0..aafa3f2b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -184,7 +184,7 @@ struct BaseParser
virtual void go( long activeRealm ) = 0;
- BstSet<String, CmpStr> genericElDefined;
+ BstSet<String, ColmCmpStr> genericElDefined;
NamespaceQual *emptyNspaceQual()
{