← Back to branch summary

~chris-rogers/maus/emr_mc_digitization

« back to all changes in this revision

Viewing changes to src/common_cpp/API/MapBase-inl.hh

  • Committer: Chris Rogers
  • Date: 2014-04-16 11:48:45 UTC
  • mfrom: (707 merge)
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: chris.rogers@stfc.ac.uk-20140416114845-h3u3q7pdcxkxvovs
Update to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common_cpp/API/MapBase-inl.hh
20
20
#include <string>
21
21
#include "src/common_cpp/API/APIExceptions.hh"
22
22
#include "src/common_cpp/API/Functions.hh"
23
 
#include "src/legacy/Interface/Squeal.hh"
 
23
#include "src/common_cpp/Utils/Exception.hh"
24
24
#include "src/common_cpp/Utils/CppErrorHandler.hh"
25
25
#include "src/common_cpp/Converter/ConverterFactory.hh"
26
26
 
44
44
    try {
45
45
      o =  _process(i);
46
46
    }
47
 
    catch(Squeal& s) {
48
 
      CppErrorHandler::getInstance()->HandleSquealNoJson(s, _classname);
 
47
    catch(Exception& s) {
 
48
      CppErrorHandler::getInstance()->HandleExceptionNoJson(s, _classname);
49
49
    }
50
50
    catch(std::exception& e) {
51
51
      CppErrorHandler::getInstance()->HandleStdExcNoJson(e, _classname);