← Back to branch summary

~mbogomilov/maus/devel3

« back to all changes in this revision

Viewing changes to src/common_cpp/JsonCppProcessors/ObjectMapProcessors-inl.hh

  • Committer: Durga Rajaram
  • Date: 2014-01-14 07:07:02 UTC
  • mfrom: (659.1.80 relcand)
  • Revision ID: durga@fnal.gov-20140114070702-2l1fuj1w6rraw7xe
Tags: MAUS-v0.7.6
MAUS-v0.7.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common_cpp/JsonCppProcessors/ObjectMapProcessors-inl.hh
40
40
                                              (const Json::Value& json_object) {
41
41
    if (json_object.type() != Json::objectValue &&
42
42
        json_object.type() != Json::nullValue) {
43
 
        throw Squeal(Squeal::recoverable,
 
43
        throw MAUS::Exception(Exception::recoverable,
44
44
                    "Can only convert json objects to maps",
45
45
                    "ObjectMapValueProcessor::JsonToCpp");
46
46
    }
51
51
        MapSecond* cpp_out;
52
52
        try {
53
53
            cpp_out = _proc->JsonToCpp(json_object[names[i]]);
54
 
        } catch(Squeal squee) {
 
54
        } catch(Exception exc) {
55
55
            delete my_map;
56
 
            throw squee;
 
56
            throw exc;
57
57
        }
58
58
        (*my_map)[names[i]] = *cpp_out;
59
59
        delete cpp_out;
80
80
        std::string child_path = GetPath(path, it->first);
81
81
        try {
82
82
            json_out = _proc->CppToJson(it->second, child_path);
83
 
        } catch(Squeal squee) {
 
83
        } catch(Exception exc) {
84
84
            delete json_object;
85
 
            throw squee;
 
85
            throw exc;
86
86
        }
87
87
        (*json_object)[it->first] = *json_out;
88
88
        JsonWrapper::Path::SetPath((*json_object)[it->first], child_path);