You need to update to the tip of /devel. The configuration.{cpp,h} and associated tests have been moved under libclickscope/ now, so you'll need to update and resolve the conflicts by getting your changes under that directory instead.
The new libclick.{cpp,h} and associated tests should be placed in libclickscope/ instead, as well.
This can be problematic, as any exceptions thrown inside callback() will result in callback() being called a second time with different arguments. I think it would be better to do this instead:
Thanks for working on this Michael.
You need to update to the tip of /devel. The configuration. {cpp,h} and associated tests have been moved under libclickscope/ now, so you'll need to update and resolve the conflicts by getting your changes under that directory instead.
The new libclick.{cpp,h} and associated tests should be placed in libclickscope/ instead, as well.
Also, I've noticed this pattern in your changes:
210 + try { list_from_ json(manifests_ json); :NoError) ; ManifestList( ), ManifestError: :ParseError) ;
211 + ManifestList manifests = manifest_
212 + callback(manifests, ManifestError:
213 + } catch (...) {
214 + callback(
215 + }
This can be problematic, as any exceptions thrown inside callback() will result in callback() being called a second time with different arguments. I think it would be better to do this instead:
ManifestList manifests; list_from_ json(manifests_ json); ManifestList( ), ManifestError: :ParseError) ; :NoError) ;
try {
manifests = manifest_
} catch (...) {
callback(
return;
}
callback(manifests, ManifestError:
This way callback() will only be called once, and any exceptions it throws won't be lost inside the try block.