diff options
| -rw-r--r-- | kalyptus/kalyptus | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 274945b3..60a2b867 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -859,7 +859,7 @@ sub identifyDecl # Class/Struct elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template \s*(class|struct|union|namespace) # 2 struct type - (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? + (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q_PACKED)? (?:\s*Q_REFCOUNT)? \s+([\w_]+ # 3 name @@ -1090,7 +1090,7 @@ sub identifyDecl $skipBlock = 1; } # explicit template instantiation, or friend template - elsif ( $decl =~ /(template|friend)\s+class\s+(?:Q[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) { + elsif ( $decl =~ /(template|friend)\s+class\s+(?:TQ[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) { # Nothing to be done with those. } else { @@ -1600,7 +1600,7 @@ sub newMethod $flags .= "n"; } - $retType =~ s/QM?_EXPORT[_A-Z]*\s*//; + $retType =~ s/TQM?_EXPORT[_A-Z]*\s*//; $retType =~ s/inline\s+//; $retType =~ s/extern\s+//; $retType =~ s/^\s*//g; |