Re: [Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp

[strk]

On Sat, May 19, 2007 at 09:45:03PM +0000, Markus Gothe wrote:

Markus, could you please use a typedef instead ?

typedef std::pair<const char*, const char*> CStrPair;
...
return CStrPair("NetStream.Buffer.Empty", "status");
return CStrPair("NetStream.Buffer.Full", "status");
..

--strk;


>               case bufferEmpty:
> -                     return make_pair("NetStream.Buffer.Empty", "status");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Buffer.Empty", "status");
>  
>               case bufferFull:
> -                     return make_pair("NetStream.Buffer.Full", "status");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Buffer.Full", "status");
>  
>               case bufferFlush:
> -                     return make_pair("NetStream.Buffer.Flush", "status");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Buffer.Flush", "status");
>  
>               case playStart:
> -                     return make_pair("NetStream.Play.Start", "status");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Play.Start", "status");
>  
>               case playStop:
> -                     return make_pair("NetStream.Play.Stop", "status");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Play.Stop", "status");
>  
>               case seekNotify:
> -                     return make_pair("NetStream.Seek.Notify", "status");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Seek.Notify", "status");
>  
>               case streamNotFound:
> -                     return make_pair("NetStream.Play.StreamNotFound", 
> "error");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Play.StreamNotFound", "error");
>  
>               case invalidTime:
> -                     return make_pair("NetStream.Seek.InvalidTime", "error");
> +                     return std::pair<const char*, const 
> char*>("NetStream.Seek.InvalidTime", "error");
>  
>               default:
> -                     return make_pair("","");
> +                     return std::pair<const char*, const char*>("","");