← Back to branch summary

~chris-rogers/maus/emr_mc_digitization

« back to all changes in this revision

Viewing changes to src/common_cpp/JsonCppProcessors/Common/ObjectProcessorNS/PointerRefItem-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/JsonCppProcessors/Common/ObjectProcessorNS/PointerRefItem-inl.hh
41
41
                      (const Json::Value& parent_json, ParentType& parent_cpp) {
42
42
    if (!parent_json.isMember(_branch)) {
43
43
        if (_required) {
44
 
            throw Squeal(Squeal::recoverable,
 
44
            throw MAUS::Exception(Exception::recoverable,
45
45
            "Missing required branch "+_branch+" converting json->cpp",
46
46
            "PointerRefItem::SetCppChild");
47
47
        } else {
51
51
    }
52
52
    if (parent_json[_branch].isNull()) {
53
53
        if (_required) {
54
 
            throw Squeal(Squeal::recoverable,
 
54
            throw MAUS::Exception(Exception::recoverable,
55
55
            "Null branch "+_branch+" converting json->cpp",
56
56
            "PointerRefItem::SetCppChild");
57
57
        } else {
61
61
    }
62
62
    if (parent_json[_branch]["$ref"].isNull()) {
63
63
        if (_required) {
64
 
            throw Squeal(Squeal::recoverable,
 
64
            throw MAUS::Exception(Exception::recoverable,
65
65
            "Null branch "+_branch+" converting json->cpp",
66
66
            "PointerRefItem::SetCppChild");
67
67
        } else {
91
91
    ChildType* child_cpp = (parent_cpp.*_getter)();
92
92
    if (child_cpp == NULL) {
93
93
        if (_required) {
94
 
            throw Squeal(Squeal::recoverable,
 
94
            throw MAUS::Exception(Exception::recoverable,
95
95
            "Failed to find branch "+_branch+": class data was NULL",
96
96
            "PointerRefItem::SetJsonChild");
97
97
        } else {