aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/asn1
diff options
context:
space:
mode:
authorRenĂ© Korthaus <[email protected]>2016-02-18 15:54:37 +0100
committerRenĂ© Korthaus <[email protected]>2016-02-18 16:13:55 +0100
commit3a8dcbed75892ee63d73e9f9310f811e6267e504 (patch)
tree7553c5eb2936898d65b89b2407d016306d257dd1 /src/lib/asn1
parent0c76098cbaa8002fb89756d6fa2b02359f3f5f88 (diff)
Fix remaining Wshadow warnings and enable on gcc and clang
Diffstat (limited to 'src/lib/asn1')
-rw-r--r--src/lib/asn1/ber_dec.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/asn1/ber_dec.cpp b/src/lib/asn1/ber_dec.cpp
index 1d981cb8b..ac676cd08 100644
--- a/src/lib/asn1/ber_dec.cpp
+++ b/src/lib/asn1/ber_dec.cpp
@@ -139,14 +139,14 @@ size_t find_eoc(DataSource* ber)
/*
* Check a type invariant on BER data
*/
-void BER_Object::assert_is_a(ASN1_Tag type_tag, ASN1_Tag class_tag)
+void BER_Object::assert_is_a(ASN1_Tag type_tag_, ASN1_Tag class_tag_)
{
- if(this->type_tag != type_tag || this->class_tag != class_tag)
+ if(type_tag != type_tag_ || class_tag != class_tag_)
throw BER_Decoding_Error("Tag mismatch when decoding got " +
- std::to_string(this->type_tag) + "/" +
- std::to_string(this->class_tag) + " expected " +
std::to_string(type_tag) + "/" +
- std::to_string(class_tag));
+ std::to_string(class_tag) + " expected " +
+ std::to_string(type_tag_) + "/" +
+ std::to_string(class_tag_));
}
/*