Author: molinaro
Date: Thu Mar 22 07:04:37 2012
New Revision: 1303672
URL: http://svn.apache.org/viewvc?rev=1303672&view=rev
Log:
THRIFT-1343 - remove internal min function, it seems the same as erlang:min/2
Modified:
thrift/trunk/lib/erl/src/thrift_framed_transport.erl
thrift/trunk/lib/erl/src/thrift_memory_buffer.erl
thrift/trunk/lib/erl/test/ (props changed)
Modified: thrift/trunk/lib/erl/src/thrift_framed_transport.erl
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/erl/src/thrift_framed_transport.erl?rev=1303672&r1=1303671&r2=1303672&view=diff
==============================================================================
--- thrift/trunk/lib/erl/src/thrift_framed_transport.erl (original)
+++ thrift/trunk/lib/erl/src/thrift_framed_transport.erl Thu Mar 22 07:04:37
2012
@@ -101,11 +101,3 @@ read(State0 = #framed_transport{wrapped
{ State0#framed_transport{wrapped = Wrapped1, read_buffer=RBuf2},
{ok, Data} }
end.
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-
-min(A,B) when A<B -> A;
-min(_,B) -> B.
-
Modified: thrift/trunk/lib/erl/src/thrift_memory_buffer.erl
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl?rev=1303672&r1=1303671&r2=1303672&view=diff
==============================================================================
--- thrift/trunk/lib/erl/src/thrift_memory_buffer.erl (original)
+++ thrift/trunk/lib/erl/src/thrift_memory_buffer.erl Thu Mar 22 07:04:37 2012
@@ -60,10 +60,3 @@ read(State = #memory_buffer{buffer = Buf
Give = min(iolist_size(Binary), Len),
{Result, Remaining} = split_binary(Binary, Give),
{State#memory_buffer{buffer = Remaining}, {ok, Result}}.
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-min(A,B) when A<B -> A;
-min(_,B) -> B.
-
Propchange: thrift/trunk/lib/erl/test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 22 07:04:37 2012
@@ -21,3 +21,5 @@ thriftTest_*
optionalRequiredTest_*
yowza_*
reverseOrderService_*
+thrift1475_*
+manyOptionals_*
