diff options
| author | Micael Karlberg <[email protected]> | 2011-03-09 15:42:59 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-09 15:42:59 +0100 |
| commit | f8aac645c1c74626049b3a30eeedb6339cd43e2c (patch) | |
| tree | fcda8e85564df7a84808c77e58e893d943a298a9 /lib/asn1/src/asn1ct_check.erl | |
| parent | 6c8f96a4a762e8bd9dd2ef758a5312791c064dd0 (diff) | |
| parent | 62e056af8c4fa058faa5087614c6b837a07f06e6 (diff) | |
| download | otp-f8aac645c1c74626049b3a30eeedb6339cd43e2c.tar.gz otp-f8aac645c1c74626049b3a30eeedb6339cd43e2c.tar.bz2 otp-f8aac645c1c74626049b3a30eeedb6339cd43e2c.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'lib/asn1/src/asn1ct_check.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_check.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl index 8b1ee6e601..efd731f052 100644 --- a/lib/asn1/src/asn1ct_check.erl +++ b/lib/asn1/src/asn1ct_check.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -6176,7 +6176,6 @@ componentrelation_leadingattr(_,[],_CompList,[],NewCompList) -> {false,lists:reverse(NewCompList)}; componentrelation_leadingattr(_,[],_CompList,LeadingAttr,NewCompList) -> {lists:last(LeadingAttr),lists:reverse(NewCompList)}; %send all info in Ts later - componentrelation_leadingattr(S,[C= #'ComponentType'{}|Cs],CompList,Acc,CompAcc) -> {LAAcc,NewC} = case catch componentrelation1(S,C#'ComponentType'.typespec, @@ -6229,7 +6228,10 @@ componentrelation_leadingattr(S,[C= #'ComponentType'{}|Cs],CompList,Acc,CompAcc) {[],C} end, componentrelation_leadingattr(S,Cs,CompList,LAAcc++Acc, - [NewC|CompAcc]). + [NewC|CompAcc]); +componentrelation_leadingattr(S,[NotComponentType|Cs],CompList,LeadingAttr,NewCompList) -> + componentrelation_leadingattr(S,Cs,CompList,LeadingAttr,[NotComponentType|NewCompList]). + object_set_mod_name(_S,ObjSet) when is_atom(ObjSet) -> ObjSet; |