diff options
author | Niclas Eklund <[email protected]> | 2010-12-10 17:00:02 +0100 |
---|---|---|
committer | Niclas Eklund <[email protected]> | 2010-12-10 17:00:02 +0100 |
commit | 8bd0325c850ad70e514f680a2dd7020144773665 (patch) | |
tree | 9d8ad2b52391cb54db7fef5c84d0b519c1d48c34 /lib/asn1/test/testINSTANCE_OF.erl | |
parent | 3cf40cefd44ab6383bd16319c7c6941fd0d0f13c (diff) | |
parent | caa311d4a2b5fb229d9369c7667b062b34945b36 (diff) | |
download | otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.gz otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.bz2 otp-8bd0325c850ad70e514f680a2dd7020144773665.zip |
Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868
Diffstat (limited to 'lib/asn1/test/testINSTANCE_OF.erl')
-rw-r--r-- | lib/asn1/test/testINSTANCE_OF.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl index 2a3a5c333b..7f5b634e06 100644 --- a/lib/asn1/test/testINSTANCE_OF.erl +++ b/lib/asn1/test/testINSTANCE_OF.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2003-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2003-2010. 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 %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %% @@ -73,17 +73,17 @@ test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4}, test_encdec(Erule,Res) -> {error,{Erule,Res}}. -wrap(ber,Int) when list(Int) -> +wrap(ber,Int) when is_list(Int) -> binary_to_list(list_to_binary(Int)); -wrap(per,Int) when list(Int) -> +wrap(per,Int) when is_list(Int) -> binary_to_list(list_to_binary(Int)); -wrap(ber_bin,Int) when list(Int) -> +wrap(ber_bin,Int) when is_list(Int) -> list_to_binary(Int); -wrap(ber_bin_v2,Int) when list(Int) -> +wrap(ber_bin_v2,Int) when is_list(Int) -> list_to_binary(Int); -wrap(per_bin,Int) when list(Int) -> +wrap(per_bin,Int) when is_list(Int) -> list_to_binary(Int); -wrap(uper_bin,Int) when list(Int) -> +wrap(uper_bin,Int) when is_list(Int) -> list_to_binary(Int); wrap(_,Int) -> Int. |