[Summary] Merging from GIT

[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
This commit is contained in:
Grygorii Zharun 2014-04-18 04:21:54 -05:00
parent 0046ee6488
commit ce2a519afa
103 changed files with 2160 additions and 915 deletions

View file

@ -78,9 +78,10 @@ PBD::set_debug_bits (uint64_t bits)
int
PBD::parse_debug_options (const char* str)
{
string in_str = str;
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
boost::char_separator<char> sep (",");
tokenizer tokens (string(str), sep);
tokenizer tokens (in_str, sep);
uint64_t bits = 0;
for (tokenizer::iterator tok_iter = tokens.begin(); tok_iter != tokens.end(); ++tok_iter) {