From 8301f00eed48f3542b089ee67d3e72b518c1258b Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Tue, 17 Sep 2013 23:55:51 -0700 Subject: [PATCH] Fix compile warnings on string literal for default parameter. --- src/mlt++/MltTokeniser.cpp | 4 ++-- src/mlt++/MltTokeniser.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mlt++/MltTokeniser.cpp b/src/mlt++/MltTokeniser.cpp index 0ae3af26..330f12e0 100644 --- a/src/mlt++/MltTokeniser.cpp +++ b/src/mlt++/MltTokeniser.cpp @@ -26,7 +26,7 @@ Tokeniser::Tokeniser( char *text, char *delimiter ) { tokens = mlt_tokeniser_init( ); if ( text != NULL ) - mlt_tokeniser_parse_new( tokens, text, delimiter ); + mlt_tokeniser_parse_new( tokens, text, delimiter? delimiter : " " ); } Tokeniser::~Tokeniser( ) @@ -36,7 +36,7 @@ Tokeniser::~Tokeniser( ) int Tokeniser::parse( char *text, char *delimiter ) { - return mlt_tokeniser_parse_new( tokens, text, delimiter ); + return mlt_tokeniser_parse_new( tokens, text, delimiter? delimiter : " " ); } int Tokeniser::count( ) diff --git a/src/mlt++/MltTokeniser.h b/src/mlt++/MltTokeniser.h index 5f2fd953..16d21de3 100644 --- a/src/mlt++/MltTokeniser.h +++ b/src/mlt++/MltTokeniser.h @@ -32,9 +32,9 @@ namespace Mlt private: mlt_tokeniser tokens; public: - Tokeniser( char *text = NULL, char *delimiter = " " ); + Tokeniser( char *text = NULL, char *delimiter = NULL ); ~Tokeniser( ); - int parse( char *text, char *delimiter = " " ); + int parse( char *text, char *delimiter = NULL ); int count( ); char *get( int index ); char *input( ); -- 2.39.2