You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2022/05/07 01:57:36 UTC

[logging-log4cxx] 01/01: Merge branch 'master' into next_stable

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit 24c4f252e7664482ef4cd663da5a87c1f8ce5908
Merge: 798ffa95 6cc5d910
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri May 6 21:57:13 2022 -0400

    Merge branch 'master' into next_stable

 .github/workflows/log4cxx.yml                      |      2 +-
 .github/workflows/sonarcloud.yml                   |     80 +
 CMakeLists.txt                                     |      7 +
 NOTICE                                             |      2 +-
 sonar-project.properties                           |     26 +
 src/cmake/boost-fallback/boost-fallback.cmake      |      4 +-
 src/cmake/projectVersionDetails.cmake              |      2 +-
 src/cmake/pthread/log4cxx-pthread.cmake            |      6 +-
 src/cmake/pthread/test-pthread-getname.cpp         |      7 +
 .../{test-pthread.cpp => test-pthread-setname.cpp} |      0
 src/main/abi-symbols/abi.dump                      | 117758 ++++++++++++++++--
 src/main/cpp/CMakeLists.txt                        |      1 +
 src/main/cpp/fixedwindowrollingpolicy.cpp          |      6 +
 src/main/cpp/loggingevent.cpp                      |     41 +
 src/main/cpp/patternlayout.cpp                     |      4 +
 src/main/cpp/rollingpolicybase.cpp                 |     14 +
 src/main/cpp/threadusernamepatternconverter.cpp    |     53 +
 src/main/cpp/timebasedrollingpolicy.cpp            |      6 +
 src/main/include/CMakeLists.txt                    |     17 +-
 src/main/include/log4cxx/log4cxx.hw                |    105 -
 .../pattern/threadusernamepatternconverter.h       |     53 +
 src/main/include/log4cxx/patternlayout.h           |      8 +-
 .../include/log4cxx/private/log4cxx_private.h.in   |      2 +
 .../include/log4cxx/private/log4cxx_private.hw     |     84 -
 .../log4cxx/private/rollingpolicybase_priv.h       |      2 +
 .../include/log4cxx/rolling/rollingpolicybase.h    |      3 +
 src/main/include/log4cxx/spi/loggingevent.h        |      7 +
 src/site/doxy/customdoxygen.css                    |      7 +
 src/site/doxy/footer.html                          |      4 +-
 src/site/markdown/1-usage.md                       |      1 +
 src/site/markdown/change-report-gh.md              |     74 +-
 src/site/markdown/development/build-cmake.md       |     62 +-
 src/site/markdown/development/build-vcpkg.md       |      5 +-
 src/site/markdown/development/building.md          |     18 +-
 src/site/markdown/development/dependencies.md      |      8 +-
 src/site/markdown/download.md.in                   |     10 +-
 src/site/markdown/qt-support.md                    |      4 +-
 src/site/resources/css/bootstrap.css               |   5893 -
 src/site/resources/css/bootstrap.min.css           |      9 -
 src/site/resources/css/site.css                    |    114 -
 src/site/resources/js/bootstrap.js                 |   2027 -
 src/site/resources/js/bootstrap.min.js             |      6 -
 src/site/resources/js/jquery.js                    |   9266 --
 src/site/resources/js/jquery.min.js                |      4 -
 src/site/resources/js/prettify.js                  |   1477 -
 src/site/resources/js/prettify.min.js              |     41 -
 src/site/resources/js/site.js                      |    113 -
 src/test/cpp/abts.cpp                              |     42 +-
 src/test/cpp/abts.h                                |      6 +-
 src/test/cpp/logunit.cpp                           |      6 +-
 src/test/cpp/logunit.h                             |      2 +-
 src/test/cpp/pattern/patternparsertestcase.cpp     |     41 +
 src/test/cpp/rolling/manualrollingtest.cpp         |     46 +-
 src/test/cpp/rolling/sizebasedrollingtest.cpp      |      4 +-
 src/test/cpp/rolling/timebasedrollingtest.cpp      |     43 +
 55 files changed, 106739 insertions(+), 30894 deletions(-)

diff --cc src/main/abi-symbols/abi.dump
index d7f7067a,975f7582..5cba1b54
--- a/src/main/abi-symbols/abi.dump
+++ b/src/main/abi-symbols/abi.dump
@@@ -202,6 -204,7 +204,10 @@@ $VAR1 = 
                           'threadlocal.h' => 1,
                           'threadpatternconverter.h' => 1,
                           'threadspecificdata.h' => 1,
++<<<<<<< HEAD
++=======
+                          'threadusernamepatternconverter.h' => 1,
++>>>>>>> master
                           'threadutility.h' => 1,
                           'throwableinformationpatternconverter.h' => 1,
                           'timebasedrollingpolicy.h' => 1,
@@@ -390,6 -398,7 +397,10 @@@
                           'threadlocal.cpp' => 1,
                           'threadpatternconverter.cpp' => 1,
                           'threadspecificdata.cpp' => 1,
++<<<<<<< HEAD
++=======
+                          'threadusernamepatternconverter.cpp' => 1,
++>>>>>>> master
                           'threadutility.cpp' => 1,
                           'throwableinformationpatternconverter.cpp' => 1,
                           'timebasedrollingpolicy.cpp' => 1,
@@@ -404,6774 -414,7253 +415,13115 @@@
                           'zipcompressaction.cpp' => 1
                         },
            'SymbolInfo' => {
++<<<<<<< HEAD
 +                            '10086264' => {
 +                                            'Class' => '596443',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'mdc.h',
 +                                            'Line' => '110',
 +                                            'MnglName' => '_ZN7log4cxx3MDCC2ERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEES8_',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10049067'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'key1',
 +                                                                  'type' => '594235'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'value',
 +                                                                  'type' => '594235'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MDC',
 +                                            'Source' => 'mdc.cpp',
 +                                            'SourceLine' => '141'
 +                                          },
 +                            '10086265' => {
 +                                            'Class' => '596443',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'mdc.h',
 +                                            'Line' => '110',
 +                                            'MnglName' => '_ZN7log4cxx3MDCC1ERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEES8_',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10049067'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'key1',
 +                                                                  'type' => '594235'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'value',
 +                                                                  'type' => '594235'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MDC',
 +                                            'Source' => 'mdc.cpp',
 +                                            'SourceLine' => '141'
 +                                          },
 +                            '10111246' => {
 +                                            'Class' => '596443',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'mdc.h',
 +                                            'Line' => '56',
 +                                            'MnglName' => '_ZN7log4cxx3MDCD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10049067'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MDC',
 +                                            'Source' => 'mdc.cpp',
 +                                            'SourceLine' => '37'
 +                                          },
 +                            '10113359' => {
 +                                            'Class' => '596443',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'mdc.h',
 +                                            'Line' => '55',
 +                                            'MnglName' => '_ZN7log4cxx3MDCC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10049067'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'key1',
 +                                                                  'type' => '55459'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'value',
 +                                                                  'type' => '55459'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MDC',
 +                                            'Source' => 'mdc.cpp',
 +                                            'SourceLine' => '30'
 +                                          },
 +                            '10113360' => {
 +                                            'Class' => '596443',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'mdc.h',
 +                                            'Line' => '55',
 +                                            'MnglName' => '_ZN7log4cxx3MDCC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10049067'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'key1',
 +                                                                  'type' => '55459'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'value',
 +                                                                  'type' => '55459'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MDC',
 +                                            'Source' => 'mdc.cpp',
 +                                            'SourceLine' => '30'
 +                                          },
 +                            '10196738' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '64',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '55441'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '91'
 +                                          },
 +                            '10196774' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '70',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEPKc',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45472'
++=======
+                             '1000721' => {
+                                            'Class' => '985323',
+                                            'Constructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriterC2ERSt10shared_ptrINS0_6WriterEE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986446'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'out1',
+                                                                  'type' => '986451'
+                                                                }
+                                                       },
+                                            'ShortName' => 'BufferedWriter',
+                                            'Source' => 'bufferedwriter.cpp',
+                                            'SourceLine' => '26'
+                                          },
+                             '1000722' => {
+                                            'Class' => '985323',
+                                            'Constructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriterC1ERSt10shared_ptrINS0_6WriterEE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986446'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'out1',
+                                                                  'type' => '986451'
+                                                                }
+                                                       },
+                                            'ShortName' => 'BufferedWriter',
+                                            'Source' => 'bufferedwriter.cpp',
+                                            'SourceLine' => '26'
+                                          },
+                             '10021532' => {
+                                             'Class' => '647214',
+                                             'Const' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream8getClassEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025121'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
+                                             'ShortName' => 'getClass',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '30',
+                                             'Virt' => 1,
+                                             'VirtPos' => '0'
+                                           },
+                             '10021572' => {
+                                             'Class' => '647214',
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream14getStaticClassEv',
+                                             'Return' => '53983',
+                                             'ShortName' => 'getStaticClass',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '30',
+                                             'Static' => 1
+                                           },
+                             '10021590' => {
+                                             'Class' => '647214',
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream13registerClassEv',
+                                             'Return' => '53989',
+                                             'ShortName' => 'registerClass',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '30',
+                                             'Static' => 1
+                                           },
+                             '10021608' => {
+                                             'Class' => '647214',
+                                             'Const' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 2,
+                                             'Line' => '37',
+                                             'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream4castERKNS0_5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025121'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '44634',
+                                             'ShortName' => 'cast',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '10021653' => {
+                                             'Class' => '647214',
+                                             'Const' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 2,
+                                             'Line' => '39',
+                                             'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream10instanceofERKNS0_5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025121'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
+                                             'ShortName' => 'instanceof',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10021773' => {
+                                             'Class' => '647214',
+                                             'Header' => 'objectoutputstream.h',
+                                             'Line' => '44',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream5closeERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Return' => '1',
+                                             'ShortName' => 'close',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '49'
+                                           },
+                             '10021805' => {
+                                             'Class' => '647214',
+                                             'Header' => 'objectoutputstream.h',
+                                             'Line' => '45',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream5flushERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Return' => '1',
+                                             'ShortName' => 'flush',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '54'
+                                           },
+                             '10021837' => {
+                                             'Class' => '647214',
+                                             'Header' => 'objectoutputstream.h',
+                                             'Line' => '46',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream5resetERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Return' => '1',
+                                             'ShortName' => 'reset',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '59'
+                                           },
+                             '10022480' => {
+                                             'Class' => '10022359',
+                                             'Const' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 2,
+                                             'Line' => '36',
+                                             'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStream7getNameB5cxx11Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025184'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10023197' => {
+                                             'Data' => 1,
+                                             'Line' => '30',
+                                             'MnglName' => '_ZN7log4cxx7classes30ObjectOutputStreamRegistrationE',
+                                             'NameSpace' => 'log4cxx::classes',
+                                             'Return' => '53989',
+                                             'ShortName' => 'ObjectOutputStreamRegistration',
+                                             'Source' => 'objectoutputstream.cpp'
+                                           },
+                             '1003724' => {
+                                            'Artificial' => 1,
+                                            'Class' => '985846',
+                                            'Destructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'InLine' => 1,
+                                            'Line' => '46',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter19ClazzBufferedWriterD0Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986475'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzBufferedWriter',
+                                            'Virt' => 1
+                                          },
+                             '1003725' => {
+                                            'Artificial' => 1,
+                                            'Class' => '985846',
+                                            'Destructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'InLine' => 1,
+                                            'Line' => '46',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter19ClazzBufferedWriterD1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986475'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzBufferedWriter',
+                                            'Virt' => 1
+                                          },
+                             '1003865' => {
+                                            'Artificial' => 1,
+                                            'Class' => '985846',
+                                            'Destructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'InLine' => 1,
+                                            'Line' => '46',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter19ClazzBufferedWriterD2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986475'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzBufferedWriter',
+                                            'Virt' => 1
+                                          },
+                             '1003955' => {
+                                            'Artificial' => 1,
+                                            'Class' => '985846',
+                                            'Constructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'InLine' => 1,
+                                            'Line' => '46',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter19ClazzBufferedWriterC2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986475'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzBufferedWriter'
+                                          },
+                             '1003956' => {
+                                            'Artificial' => 1,
+                                            'Class' => '985846',
+                                            'Constructor' => 1,
+                                            'Header' => 'bufferedwriter.h',
+                                            'InLine' => 1,
+                                            'Line' => '46',
+                                            'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter19ClazzBufferedWriterC1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '986475'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzBufferedWriter'
+                                          },
+                             '10054599' => {
+                                             'Class' => '647214',
+                                             'Destructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ObjectOutputStream',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '44',
+                                             'Virt' => 1
+                                           },
+                             '10054600' => {
+                                             'Class' => '647214',
+                                             'Destructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ObjectOutputStream',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '44',
+                                             'Virt' => 1
+                                           },
+                             '10054695' => {
+                                             'Class' => '647214',
+                                             'Destructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ObjectOutputStream',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '44',
+                                             'Virt' => 1
+                                           },
+                             '10056610' => {
+                                             'Class' => '647214',
+                                             'Constructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamC2ESt10shared_ptrINS0_12OutputStreamEERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'outputStream',
+                                                                   'type' => '4514289'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ObjectOutputStream',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '32'
+                                           },
+                             '10056611' => {
+                                             'Class' => '647214',
+                                             'Constructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamC1ESt10shared_ptrINS0_12OutputStreamEERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025132'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'outputStream',
+                                                                   'type' => '4514289'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ObjectOutputStream',
+                                             'Source' => 'objectoutputstream.cpp',
+                                             'SourceLine' => '32'
+                                           },
+                             '10060289' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10022359',
+                                             'Destructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 1,
+                                             'Line' => '36',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025167'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ClazzObjectOutputStream',
+                                             'Virt' => 1
+                                           },
+                             '10060290' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10022359',
+                                             'Destructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 1,
+                                             'Line' => '36',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025167'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ClazzObjectOutputStream',
+                                             'Virt' => 1
+                                           },
+                             '10060431' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10022359',
+                                             'Destructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 1,
+                                             'Line' => '36',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025167'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ClazzObjectOutputStream',
+                                             'Virt' => 1
+                                           },
+                             '10060522' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10022359',
+                                             'Constructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 1,
+                                             'Line' => '36',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025167'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ClazzObjectOutputStream'
+                                           },
+                             '10060523' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10022359',
+                                             'Constructor' => 1,
+                                             'Header' => 'objectoutputstream.h',
+                                             'InLine' => 1,
+                                             'Line' => '36',
+                                             'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10025167'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'ClazzObjectOutputStream'
+                                           },
+                             '10174049' => {
+                                             'Class' => '10174040',
+                                             'Header' => 'sizebasedtriggeringpolicy.h',
+                                             'Line' => '75',
+                                             'MnglName' => '_ZN7log4cxx7rolling25SizeBasedTriggeringPolicy14setMaxFileSizeEm',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '14065148'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'l',
+                                                                   'type' => '41030'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Reg' => {
+                                                        '0' => 'rdi',
+                                                        '1' => 'rsi'
+                                                      },
+                                             'Return' => '1',
+                                             'ShortName' => 'setMaxFileSize',
+                                             'Source' => 'sizebasedtriggeringpolicy.cpp',
+                                             'SourceLine' => '46'
+                                           },
+                             '10174316' => {
+                                             'Data' => 1,
+                                             'Line' => '67',
+                                             'MnglName' => '_ZN7log4cxx7classes39ObsoleteRollingFileAppenderRegistrationE',
+                                             'NameSpace' => 'log4cxx::classes',
+                                             'Return' => '53989',
+                                             'ShortName' => 'ObsoleteRollingFileAppenderRegistration',
+                                             'Source' => 'obsoleterollingfileappender.cpp'
+                                           },
+                             '10174431' => {
+                                             'Class' => '10174334',
+                                             'Const' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZNK7log4cxx19RollingFileAppender8getClassEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178594'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
+                                             'ShortName' => 'getClass',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'SourceLine' => '49',
+                                             'Virt' => 1,
+                                             'VirtPos' => '0'
+                                           },
+                             '10174470' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender14getStaticClassEv',
+                                             'Return' => '53983',
+                                             'ShortName' => 'getStaticClass',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'SourceLine' => '53',
+                                             'Static' => 1
+                                           },
+                             '10174488' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender13registerClassEv',
+                                             'Return' => '53989',
+                                             'ShortName' => 'registerClass',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'SourceLine' => '58',
+                                             'Static' => 1
+                                           },
+                             '10174506' => {
+                                             'Class' => '10174334',
+                                             'Const' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'InLine' => 2,
+                                             'Line' => '45',
+                                             'MnglName' => '_ZNK7log4cxx19RollingFileAppender4castERKNS_7helpers5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178594'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '44634',
+                                             'ShortName' => 'cast',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '10174550' => {
+                                             'Class' => '10174334',
+                                             'Const' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'InLine' => 2,
+                                             'Line' => '48',
+                                             'MnglName' => '_ZNK7log4cxx19RollingFileAppender10instanceofERKNS_7helpers5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178594'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
+                                             'ShortName' => 'instanceof',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10174773' => {
+                                             'Class' => '10174334',
+                                             'Const' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZNK7log4cxx19RollingFileAppender17getMaxBackupIndexEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178594'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'Return' => '40835',
+                                             'ShortName' => 'getMaxBackupIndex',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'SourceLine' => '132'
+                                           },
+                             '10174804' => {
+                                             'Class' => '10174334',
+                                             'Const' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZNK7log4cxx19RollingFileAppender18getMaximumFileSizeEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178594'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'Return' => '40848',
+                                             'ShortName' => 'getMaximumFileSize',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'SourceLine' => '137'
+                                           },
+                             '10174835' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender17setMaxBackupIndexEi',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'maxBackups',
+                                                                   'type' => '40835'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setMaxBackupIndex',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '142'
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '105'
                                            },
++<<<<<<< HEAD
 +                            '10196810' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '76',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEPc',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '46283'
++=======
+                             '10174867' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender14setMaxFileSizeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'value',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setMaxFileSize',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '152'
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '125'
                                            },
++<<<<<<< HEAD
 +                            '10196846' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '83',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEc',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45023'
++=======
+                             '10174899' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender18setMaximumFileSizeEi',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'maxFileSize1',
+                                                                   'type' => '40835'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setMaximumFileSize',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '147'
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '130'
                                            },
++<<<<<<< HEAD
 +                            '10196882' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '90',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEPFRSt8ios_baseS3_E',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'manip',
 +                                                                  'type' => '10197497'
++=======
+                             '10174931' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender9setOptionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'option',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'value',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setOption',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '107',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '6'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '179'
                                            },
++<<<<<<< HEAD
 +                            '10196918' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '96',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEb',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44689'
++=======
+                             '10174976' => {
+                                             'Class' => '10174334',
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppender15activateOptionsERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'activateOptions',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '157',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '5'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '186'
 +                                          },
++<<<<<<< HEAD
 +                            '10196954' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '103',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEs',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44629'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '190'
                                            },
 +                            '10196990' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '109',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEi',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44636'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '194'
 +                                          },
 +                            '10197026' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '115',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEj',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44572'
++=======
+                             '10175148' => {
+                                             'Class' => '10175036',
+                                             'Const' => 1,
+                                             'InLine' => 2,
+                                             'Line' => '38',
+                                             'MnglName' => '_ZNK7log4cxx24ClassRollingFileAppender7getNameB5cxx11Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178634'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10175187' => {
+                                             'Class' => '10175036',
+                                             'Const' => 1,
+                                             'InLine' => 2,
+                                             'Line' => '42',
+                                             'MnglName' => '_ZNK7log4cxx24ClassRollingFileAppender11newInstanceEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178634'
+                                                                 }
+                                                        },
+                                             'Return' => '133598',
+                                             'ShortName' => 'newInstance',
+                                             'Source' => 'obsoleterollingfileappender.cpp',
+                                             'Virt' => 1,
+                                             'VirtPos' => '2'
+                                           },
+                             '10179701' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10175036',
+                                             'Destructor' => 1,
+                                             'InLine' => 1,
+                                             'Line' => '34',
+                                             'MnglName' => '_ZN7log4cxx24ClassRollingFileAppenderD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178611'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClassRollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '198'
                                            },
++<<<<<<< HEAD
 +                            '10197062' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '121',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEl',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44649'
++=======
+                             '10179702' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10175036',
+                                             'Destructor' => 1,
+                                             'InLine' => 1,
+                                             'Line' => '34',
+                                             'MnglName' => '_ZN7log4cxx24ClassRollingFileAppenderD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178611'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClassRollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '202'
                                            },
++<<<<<<< HEAD
 +                            '10197098' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '127',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEm',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44598'
++=======
+                             '10179843' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10175036',
+                                             'Destructor' => 1,
+                                             'InLine' => 1,
+                                             'Line' => '34',
+                                             'MnglName' => '_ZN7log4cxx24ClassRollingFileAppenderD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178611'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClassRollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '206'
                                            },
++<<<<<<< HEAD
 +                            '10197134' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '133',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEf',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44682'
++=======
+                             '10204079' => {
+                                             'Class' => '10174334',
+                                             'Destructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '102',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '210'
                                            },
++<<<<<<< HEAD
 +                            '10197170' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '139',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEd',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44675'
++=======
+                             '10204179' => {
+                                             'Class' => '10174334',
+                                             'Destructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '102',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '214'
                                            },
++<<<<<<< HEAD
 +                            '10197206' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '145',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEe',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'offset' => '0',
 +                                                                  'type' => '44668'
++=======
+                             '10205836' => {
+                                             'Class' => '10174334',
+                                             'Destructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '102',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '218'
                                            },
++<<<<<<< HEAD
 +                            '10197242' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '151',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferlsEPv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44905'
++=======
+                             '10207397' => {
+                                             'Class' => '10174334',
+                                             'Constructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderC1ERKSt10shared_ptrINS_6LayoutEERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'newLayout',
+                                                                   'type' => '337314'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'filename',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '92'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '222'
                                            },
++<<<<<<< HEAD
 +                            '10197278' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '156',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBuffercvRSoEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
++=======
+                             '10208932' => {
+                                             'Class' => '10174334',
+                                             'Constructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderC2ERKSt10shared_ptrINS_6LayoutEERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'newLayout',
+                                                                   'type' => '337314'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'filename',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '92'
 +                                            'Return' => '9701688',
 +                                            'ShortName' => 'operator std::basic_ostream<char>&',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '145'
                                            },
++<<<<<<< HEAD
 +                            '10197309' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '163',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBuffer3strB5cxx11ERSo',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '9701688'
++=======
+                             '10210376' => {
+                                             'Class' => '10174334',
+                                             'Constructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderC1ERKSt10shared_ptrINS_6LayoutEERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'newLayout',
+                                                                   'type' => '337314'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'filename',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'append',
+                                                                   'type' => '40888'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '79'
 +                                            'Reg' => {
 +                                                       '1' => 'rsi'
 +                                                     },
 +                                            'Return' => '55441',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '160'
                                            },
++<<<<<<< HEAD
 +                            '10197345' => {
 +                                            'Class' => '10196576',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '170',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBuffer3strB5cxx11ERS1_',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '10200152'
++=======
+                             '10211957' => {
+                                             'Class' => '10174334',
+                                             'Constructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderC2ERKSt10shared_ptrINS_6LayoutEERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'newLayout',
+                                                                   'type' => '337314'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'filename',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'append',
+                                                                   'type' => '40888'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '79'
 +                                            'Reg' => {
 +                                                       '0' => 'rdi',
 +                                                       '1' => 'rsi'
 +                                                     },
 +                                            'Return' => '55441',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '169'
                                            },
++<<<<<<< HEAD
 +                            '10197381' => {
 +                                            'Class' => '10196576',
 +                                            'Const' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '176',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers17CharMessageBuffer9hasStreamEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200192'
++=======
+                             '10213398' => {
+                                             'Class' => '10174334',
+                                             'Constructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '74'
 +                                            'Reg' => {
 +                                                       '0' => 'rdi'
 +                                                     },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'hasStream',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '174'
                                            },
++<<<<<<< HEAD
 +                            '10197674' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '394',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '594211'
++=======
+                             '10213658' => {
+                                             'Class' => '10174334',
+                                             'Constructor' => 1,
+                                             'Header' => 'rollingfileappender.h',
+                                             'MnglName' => '_ZN7log4cxx19RollingFileAppenderC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10178566'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'RollingFileAppender',
 -                                            'Source' => 'obsoleterollingfileappender.cpp',
 -                                            'SourceLine' => '74'
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '276'
 +                                          },
++<<<<<<< HEAD
 +                            '10197711' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '400',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEPKw',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45630'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '290'
 +                                          },
 +                            '10197748' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '406',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEPw',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45568'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '311'
 +                                          },
 +                            '10197785' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '413',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEw',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '44756'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '316'
                                            },
 +                            '10197822' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '420',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEPFRSt8ios_baseS3_E',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'manip',
 +                                                                  'type' => '10197497'
++=======
+                             '10306360' => {
+                                             'Class' => '10306186',
+                                             'Const' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZNK7log4cxx2db12ODBCAppender8getClassEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310598'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
+                                             'ShortName' => 'getClass',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '91',
+                                             'Virt' => 1,
+                                             'VirtPos' => '0'
+                                           },
+                             '10306399' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender14getStaticClassEv',
+                                             'Return' => '53983',
+                                             'ShortName' => 'getStaticClass',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '91',
+                                             'Static' => 1
+                                           },
+                             '10306417' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender13registerClassEv',
+                                             'Return' => '53989',
+                                             'ShortName' => 'registerClass',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '91',
+                                             'Static' => 1
+                                           },
+                             '10306435' => {
+                                             'Class' => '10306186',
+                                             'Const' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 2,
+                                             'Line' => '155',
+                                             'MnglName' => '_ZNK7log4cxx2db12ODBCAppender4castERKNS_7helpers5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310598'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '44634',
+                                             'ShortName' => 'cast',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '10306479' => {
+                                             'Class' => '10306186',
+                                             'Const' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 2,
+                                             'Line' => '158',
+                                             'MnglName' => '_ZNK7log4cxx2db12ODBCAppender10instanceofERKNS_7helpers5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310598'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
+                                             'ShortName' => 'instanceof',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10306603' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender9setOptionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'option',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'value',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setOption',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '105',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '6'
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '365'
 +                                          },
++<<<<<<< HEAD
 +                            '10197859' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '426',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEb',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44689'
 +                                                                }
 +                                                       },
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '372'
 +                                          },
 +                            '10197896' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '433',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEs',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44629'
 +                                                                }
 +                                                       },
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '376'
                                            },
 +                            '10197933' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '439',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEi',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44636'
 +                                                                }
 +                                                       },
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '380'
 +                                          },
 +                            '10197970' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '445',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEj',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44572'
++=======
+                             '10306648' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender15activateOptionsERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi',
+                                                        '1' => 'rsi'
+                                                      },
+                                             'Return' => '1',
+                                             'ShortName' => 'activateOptions',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '135',
+                                             'Virt' => 1,
+                                             'VirtPos' => '5'
+                                           },
+                             '10306688' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender6appendERKSt10shared_ptrINS_3spi12LoggingEventEERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'event',
+                                                                   'type' => '117970'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Return' => '1',
+                                             'ShortName' => 'append',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '143',
+                                             'Virt' => 1,
+                                             'VirtPos' => '17'
+                                           },
+                             '10306733' => {
+                                             'Class' => '10306186',
+                                             'Const' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZNK7log4cxx2db12ODBCAppender15getLogStatementB5cxx11ERKSt10shared_ptrINS_3spi12LoggingEventEERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310598'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'event',
+                                                                   'type' => '117970'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Protected' => 1,
+                                             'Return' => '53185',
+                                             'ShortName' => 'getLogStatement',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '156'
+                                           },
+                             '10306774' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender7executeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'sql',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'Return' => '1',
 -                                            'ShortName' => 'execute',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '163',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '18'
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '384'
                                            },
++<<<<<<< HEAD
 +                            '10198007' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '451',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEl',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44649'
++=======
+                             '10306819' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender15closeConnectionEPv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '10306254'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'closeConnection',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '209',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '19'
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '388'
 +                                          },
++<<<<<<< HEAD
 +                            '10198044' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '457',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEm',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44598'
 +                                                                }
 +                                                       },
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '392'
                                            },
 +                            '10198081' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '463',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEf',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44682'
++=======
+                             '10306859' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender13getConnectionERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Protected' => 1,
+                                             'Return' => '10306254',
+                                             'ShortName' => 'getConnection',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '217',
+                                             'Virt' => 1,
+                                             'VirtPos' => '20'
+                                           },
+                             '10306903' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender5closeEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'close',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '282',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '10'
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '396'
                                            },
++<<<<<<< HEAD
 +                            '10198118' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '469',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEd',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44675'
++=======
+                             '10306940' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender11flushBufferERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'flushBuffer',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '318',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '21'
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '400'
 +                                          },
++<<<<<<< HEAD
 +                            '10198155' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '475',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEe',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'offset' => '0',
 +                                                                  'type' => '44668'
 +                                                                }
 +                                                       },
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '404'
                                            },
 +                            '10198192' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '481',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferlsEPv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44905'
++=======
+                             '10306982' => {
+                                             'Class' => '10306186',
+                                             'Const' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 2,
+                                             'Line' => '237',
+                                             'MnglName' => '_ZNK7log4cxx2db12ODBCAppender14requiresLayoutEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310598'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'Return' => '40888',
+                                             'ShortName' => 'requiresLayout',
+                                             'Virt' => 1,
+                                             'VirtPos' => '16'
+                                           },
+                             '10307021' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender6setSqlERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 's',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setSql',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '341'
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '408'
                                            },
++<<<<<<< HEAD
 +                            '10198229' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '487',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBuffercvRSt13basic_ostreamIwSt11char_traitsIwEEEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
++=======
+                             '10307423' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender6encodeEPPwRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'dest',
+                                                                   'type' => '43050'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'src',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Private' => 1,
 -                                            'Return' => '1',
 -                                            'ShortName' => 'encode',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '363',
 -                                            'Static' => 1
 +                                            'Return' => '9701694',
 +                                            'ShortName' => 'operator std::basic_ostream<wchar_t>&',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '331'
 +                                          },
++<<<<<<< HEAD
 +                            '10198261' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '494',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBuffer3strB5cxx11ERSt13basic_ostreamIwSt11char_traitsIwEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '9701694'
 +                                                                }
 +                                                       },
 +                                            'Reg' => {
 +                                                       '1' => 'rsi'
 +                                                     },
 +                                            'Return' => '594211',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '346'
                                            },
 +                            '10198298' => {
 +                                            'Class' => '10197509',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '501',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBuffer3strB5cxx11ERS1_',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '10200515'
++=======
+                             '10307456' => {
+                                             'Class' => '10306186',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender6encodeEPPtRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'dest',
+                                                                   'type' => '10310643'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'src',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Private' => 1,
 -                                            'Return' => '1',
 -                                            'ShortName' => 'encode',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '369',
 -                                            'Static' => 1
 +                                            'Reg' => {
 +                                                       '0' => 'rdi',
 +                                                       '1' => 'rsi'
 +                                                     },
 +                                            'Return' => '594211',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '355'
                                            },
++<<<<<<< HEAD
 +                            '10198335' => {
 +                                            'Class' => '10197509',
++=======
+                             '10307610' => {
+                                             'Class' => '10307489',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'odbcappender.h',
 -                                            'InLine' => 2,
 -                                            'Line' => '154',
 -                                            'MnglName' => '_ZNK7log4cxx2db12ODBCAppender17ClazzODBCAppender7getNameB5cxx11Ev',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '507',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers17WideMessageBuffer9hasStreamEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10200527'
 +                                                                }
 +                                                       },
 +                                            'Reg' => {
 +                                                       '0' => 'rdi'
 +                                                     },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'hasStream',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '360'
 +                                          },
 +                            '10198624' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '549',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBuffercvRSoEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator std::ostream&',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '458'
 +                                          },
 +                            '10198656' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '557',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '55459'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '463'
 +                                          },
 +                            '10198693' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '564',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEPKc',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45472'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '468'
 +                                          },
 +                            '10198730' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '571',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEPc',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '46283'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '472'
 +                                          },
 +                            '10198767' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '579',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEc',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45023'
++=======
+                                                                   'type' => '10310678'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10307649' => {
+                                             'Class' => '10307489',
+                                             'Const' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 2,
+                                             'Line' => '154',
+                                             'MnglName' => '_ZNK7log4cxx2db12ODBCAppender17ClazzODBCAppender11newInstanceEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310678'
+                                                                 }
+                                                        },
+                                             'Return' => '10310603',
+                                             'ShortName' => 'newInstance',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '10307833' => {
+                                             'Class' => '10307697',
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLException13formatMessageEsPvPKcRNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'fHandleType',
+                                                                   'type' => '40828'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'hInput',
+                                                                   'type' => '41104'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'prolog',
+                                                                   'type' => '41670'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '41670',
+                                             'ShortName' => 'formatMessage',
+                                             'Source' => 'odbcappender.cpp',
+                                             'SourceLine' => '60'
+                                           },
+                             '10307933' => {
+                                             'Data' => 1,
+                                             'Line' => '91',
+                                             'MnglName' => '_ZN7log4cxx7classes24ODBCAppenderRegistrationE',
+                                             'NameSpace' => 'log4cxx::classes',
+                                             'Return' => '53989',
+                                             'ShortName' => 'ODBCAppenderRegistration',
+                                             'Source' => 'odbcappender.cpp'
+                                           },
+                             '10307960' => {
+                                             'Class' => '911163',
+                                             'Header' => 'patternlayout.h',
+                                             'Line' => '381',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout14getStaticClassEv',
+                                             'Private' => 1,
+                                             'Return' => '53983',
+                                             'ShortName' => 'getStaticClass',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '60',
+                                             'Static' => 1
+                                           },
+                             '10307973' => {
+                                             'Class' => '911163',
+                                             'Header' => 'patternlayout.h',
+                                             'Line' => '402',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout20setConversionPatternERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '1',
+                                             'ShortName' => 'setConversionPattern',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '77'
+                                           },
+                             '10308502' => {
+                                             'Header' => 'object.h',
+                                             'InLine' => 2,
+                                             'Line' => '122',
+                                             'MnglName' => '_ZN7log4cxx4castINS_13PatternLayoutENS_6LayoutELb0ELb0EEESt10shared_ptrIT_ERKS3_IT0_E',
+                                             'NameSpace' => 'log4cxx',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'incoming',
+                                                                   'type' => '336806'
+                                                                 }
+                                                        },
+                                             'Return' => '10282707',
+                                             'ShortName' => 'cast<log4cxx::PatternLayout, log4cxx::Layout>',
+                                             'TParam' => {
+                                                           '0' => {
+                                                                    'key' => 'Ret',
+                                                                    'type' => '911163'
+                                                                  },
+                                                           '1' => {
+                                                                    'key' => 'Type',
+                                                                    'type' => '334707'
+                                                                  }
+                                                         }
+                                           },
+                             '10311414' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307697',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '38',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Virt' => 1
 +                                            'Return' => '10200152',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '477'
                                            },
++<<<<<<< HEAD
 +                            '10198804' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '587',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBuffer3strB5cxx11ERNS0_17CharMessageBufferE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'buf',
 +                                                                  'type' => '10200152'
++=======
+                             '10311415' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307697',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '38',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Virt' => 1
 +                                            'Return' => '55459',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '482'
                                            },
++<<<<<<< HEAD
 +                            '10198841' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '595',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBuffer3strB5cxx11ERSo',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'os',
 +                                                                  'type' => '10200158'
++=======
+                             '10311605' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307697',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '38',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Virt' => 1
 +                                            'Return' => '55459',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '487'
                                            },
++<<<<<<< HEAD
 +                            '10198878' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '603',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '594235'
++=======
+                             '10349396' => {
+                                             'Class' => '10306186',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppenderD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ODBCAppender',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '100',
 -                                            'Virt' => 1
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '492'
                                            },
++<<<<<<< HEAD
 +                            '10198915' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '610',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEPKw',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45630'
++=======
+                             '10349496' => {
+                                             'Class' => '10306186',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppenderD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ODBCAppender',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '100',
 -                                            'Virt' => 1
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '498'
                                            },
++<<<<<<< HEAD
 +                            '10198952' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '617',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEPw',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '45568'
++=======
+                             '10356584' => {
+                                             'Class' => '10306186',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppenderD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ODBCAppender',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '100',
 -                                            'Virt' => 1
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '503'
                                            },
++<<<<<<< HEAD
 +                            '10198989' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '624',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEw',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'msg',
 +                                                                  'type' => '44756'
++=======
+                             '10363545' => {
+                                             'Class' => '10306186',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppenderC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ODBCAppender',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '95'
 +                                            'Return' => '10200515',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '509'
                                            },
++<<<<<<< HEAD
 +                            '10199026' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '672',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEPFRSt8ios_baseS3_E',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'manip',
 +                                                                  'type' => '10197497'
++=======
+                             '10366809' => {
+                                             'Class' => '10306186',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppenderC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310609'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ODBCAppender',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '95'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '451'
                                            },
++<<<<<<< HEAD
 +                            '10199063' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '679',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEb',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44689'
++=======
+                             '10374169' => {
+                                             'Class' => '10307697',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionC2ERKS1_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'src',
+                                                                   'type' => '10310694'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '55'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '525'
                                            },
++<<<<<<< HEAD
 +                            '10199100' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '686',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEs',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44629'
++=======
+                             '10374170' => {
+                                             'Class' => '10307697',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionC1ERKS1_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'src',
+                                                                   'type' => '10310694'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '55'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '529'
                                            },
++<<<<<<< HEAD
 +                            '10199137' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '692',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEi',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44636'
++=======
+                             '10374290' => {
+                                             'Class' => '10307697',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionC2EPKc',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'msg',
+                                                                   'type' => '41670'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '50'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '533'
                                            },
++<<<<<<< HEAD
 +                            '10199174' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '698',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEj',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44572'
++=======
+                             '10374291' => {
+                                             'Class' => '10307697',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionC1EPKc',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'msg',
+                                                                   'type' => '41670'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '50'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '537'
                                            },
++<<<<<<< HEAD
 +                            '10199211' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '704',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEl',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44649'
++=======
+                             '10374445' => {
+                                             'Class' => '10307697',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionC2EsPvPKcRNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'fHandleType',
+                                                                   'type' => '40828'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'hInput',
+                                                                   'type' => '41104'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'prolog',
+                                                                   'type' => '41670'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '42'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '541'
                                            },
++<<<<<<< HEAD
 +                            '10199248' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '710',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEm',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44598'
++=======
+                             '10374446' => {
+                                             'Class' => '10307697',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'MnglName' => '_ZN7log4cxx2db12SQLExceptionC1EsPvPKcRNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310689'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'fHandleType',
+                                                                   'type' => '40828'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'hInput',
+                                                                   'type' => '41104'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'prolog',
+                                                                   'type' => '41670'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'SQLException',
 -                                            'Source' => 'odbcappender.cpp',
 -                                            'SourceLine' => '42'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '545'
                                            },
++<<<<<<< HEAD
 +                            '10199285' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '716',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEf',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44682'
++=======
+                             '10375775' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307489',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '154',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender17ClazzODBCAppenderD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310661'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzODBCAppender',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '549'
                                            },
++<<<<<<< HEAD
 +                            '10199322' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '722',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEd',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44675'
++=======
+                             '10375776' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307489',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '154',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender17ClazzODBCAppenderD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310661'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzODBCAppender',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '553'
                                            },
++<<<<<<< HEAD
 +                            '10199359' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '728',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEe',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'offset' => '0',
 +                                                                  'type' => '44668'
++=======
+                             '10375917' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307489',
+                                             'Destructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '154',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender17ClazzODBCAppenderD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310661'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzODBCAppender',
 -                                            'Virt' => 1
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '557'
                                            },
++<<<<<<< HEAD
 +                            '10199396' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '734',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferlsEPv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44905'
++=======
+                             '10376007' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307489',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '154',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender17ClazzODBCAppenderC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310661'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzODBCAppender'
 +                                            'Return' => '10200158',
 +                                            'ShortName' => 'operator<<',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '561'
                                            },
++<<<<<<< HEAD
 +                            '10199433' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '741',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBuffer3strB5cxx11ERNS0_17WideMessageBufferE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'buf',
 +                                                                  'type' => '10200515'
++=======
+                             '10376008' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10307489',
+                                             'Constructor' => 1,
+                                             'Header' => 'odbcappender.h',
+                                             'InLine' => 1,
+                                             'Line' => '154',
+                                             'MnglName' => '_ZN7log4cxx2db12ODBCAppender17ClazzODBCAppenderC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10310661'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzODBCAppender'
 +                                            'Return' => '594235',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '515'
 +                                          },
++<<<<<<< HEAD
 +                            '10199470' => {
 +                                            'Class' => '10198455',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '749',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBuffer3strB5cxx11ERSt13basic_ostreamIwSt11char_traitsIwEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'os',
 +                                                                  'type' => '9701694'
 +                                                                }
 +                                                       },
 +                                            'Return' => '594235',
 +                                            'ShortName' => 'str',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '520'
                                            },
 +                            '10199507' => {
 +                                            'Class' => '10198455',
++=======
+                             '10438125' => {
+                                             'Class' => '334408',
+                                             'Const' => 1,
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler8getClassEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439932'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
+                                             'ShortName' => 'getClass',
+                                             'Source' => 'onlyonceerrorhandler.cpp',
+                                             'SourceLine' => '27',
+                                             'Virt' => 1,
+                                             'VirtPos' => '0'
+                                           },
+                             '10438164' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler14getStaticClassEv',
+                                             'Return' => '53983',
+                                             'ShortName' => 'getStaticClass',
+                                             'Source' => 'onlyonceerrorhandler.cpp',
+                                             'SourceLine' => '27',
+                                             'Static' => 1
+                                           },
+                             '10438182' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler13registerClassEv',
+                                             'Return' => '53989',
+                                             'ShortName' => 'registerClass',
+                                             'Source' => 'onlyonceerrorhandler.cpp',
+                                             'SourceLine' => '27',
+                                             'Static' => 1
+                                           },
+                             '10438200' => {
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 -                                            'InLine' => 2,
 -                                            'Line' => '54',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler4castERKNS0_5ClassE',
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '773',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers13MessageBuffer9hasStreamEv',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10200856'
 +                                                                }
 +                                                       },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'hasStream',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '442'
 +                                          },
 +                            '10231993' => {
++=======
+                                                                   'type' => '10439932'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '44634',
+                                             'ShortName' => 'cast',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '10438244' => {
+                                             'Class' => '334408',
+                                             'Const' => 1,
+                                             'Header' => 'onlyonceerrorhandler.h',
++>>>>>>> master
                                              'InLine' => 2,
 -                                            'Line' => '57',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler10instanceofERKNS0_5ClassE',
 +                                            'Line' => '37',
 +                                            'MnglName' => '_Z11ResetStreamIwEvRNSt7__cxx1119basic_ostringstreamIT_St11char_traitsIS2_ESaIS2_EEE',
 +                                            'Param' => {
 +                                                         '0' => {
++<<<<<<< HEAD
 +                                                                  'name' => 'stream',
 +                                                                  'type' => '10234895'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'ResetStream<wchar_t>',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'TParam' => {
 +                                                          '0' => {
 +                                                                   'key' => 'T',
 +                                                                   'type' => '44749'
 +                                                                 }
 +                                                        }
 +                                          },
 +                            '10237572' => {
 +                                            'InLine' => 2,
 +                                            'Line' => '37',
 +                                            'MnglName' => '_Z11ResetStreamIcEvRNSt7__cxx1119basic_ostringstreamIT_St11char_traitsIS2_ESaIS2_EEE',
                                              'Param' => {
                                                           '0' => {
 +                                                                  'name' => 'stream',
 +                                                                  'type' => '10240474'
++=======
+                                                                   'name' => 'this',
+                                                                   'type' => '10439932'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
+                                             'ShortName' => 'instanceof',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10438325' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler9setLoggerERKSt10shared_ptrINS_6LoggerEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439898'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '4139843'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 -                                                     },
                                              'Return' => '1',
 -                                            'ShortName' => 'setLogger',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '35',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '7'
 +                                            'ShortName' => 'ResetStream<char>',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'TParam' => {
 +                                                          '0' => {
 +                                                                   'key' => 'T',
 +                                                                   'type' => '45016'
 +                                                                 }
 +                                                        }
                                            },
++<<<<<<< HEAD
 +                            '10256744' => {
 +                                            'Class' => '10198455',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '544',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
++=======
+                             '10438365' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler15activateOptionsERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439898'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'activateOptions',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '39',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '5'
 +                                            'ShortName' => 'MessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '438'
                                            },
++<<<<<<< HEAD
 +                            '10257468' => {
 +                                            'Class' => '10198455',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '540',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
++=======
+                             '10438405' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler9setOptionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439898'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p2',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi',
 -                                                       '2' => 'rdx'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setOption',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '43',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '6'
 +                                            'ShortName' => 'MessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '433'
                                            },
++<<<<<<< HEAD
 +                            '10257469' => {
 +                                            'Class' => '10198455',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '540',
 +                                            'MnglName' => '_ZN7log4cxx7helpers13MessageBufferC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200845'
++=======
+                             '10438450' => {
+                                             'Class' => '334408',
+                                             'Const' => 1,
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler5errorERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt9exceptioni',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439932'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'message',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'e',
+                                                                   'type' => '54167'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'p3',
+                                                                   'type' => '40835'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '3' => 'rcx'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'error',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '47',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '8'
 +                                            'ShortName' => 'MessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '433'
                                            },
++<<<<<<< HEAD
 +                            '10272546' => {
 +                                            'Class' => '10197509',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '386',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
++=======
+                             '10438500' => {
+                                             'Class' => '334408',
+                                             'Const' => 1,
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler5errorERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt9exceptioniRKSt10shared_ptrINS_3spi12LoggingEventEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439932'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'message',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'e',
+                                                                   'type' => '54167'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'errorCode',
+                                                                   'type' => '40835'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'p4',
+                                                                   'type' => '117970'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '4' => 'r8'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'error',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '57',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '10'
 +                                            'ShortName' => 'WideMessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '268'
 +                                          },
 +                            '10273725' => {
 +                                            'Class' => '10197509',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '382',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'WideMessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '242'
 +                                          },
 +                            '10273726' => {
 +                                            'Class' => '10197509',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '382',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17WideMessageBufferC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200510'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'WideMessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '242'
 +                                          },
 +                            '10288610' => {
 +                                            'Class' => '10196576',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '56',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'CharMessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '83'
 +                                          },
 +                            '10289787' => {
 +                                            'Class' => '10196576',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '52',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'CharMessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '58'
 +                                          },
 +                            '10289788' => {
 +                                            'Class' => '10196576',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'messagebuffer.h',
 +                                            'Line' => '52',
 +                                            'MnglName' => '_ZN7log4cxx7helpers17CharMessageBufferC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10200147'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'CharMessageBuffer',
 +                                            'Source' => 'messagebuffer.cpp',
 +                                            'SourceLine' => '58'
                                            },
++<<<<<<< HEAD
 +                            '1031817' => {
 +                                           'Class' => '1031807',
 +                                           'Header' => 'logger.h',
 +                                           'Line' => '683',
 +                                           'MnglName' => '_ZN7log4cxx6Logger13getRootLoggerEv',
 +                                           'Private' => 1,
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getRootLogger',
 +                                           'Source' => 'logger.cpp',
 +                                           'SourceLine' => '546',
 +                                           'Static' => 1
 +                                         },
 +                            '1031872' => {
 +                                           'Class' => '1031832',
 +                                           'Header' => 'basicconfigurator.h',
 +                                           'Line' => '47',
 +                                           'MnglName' => '_ZN7log4cxx17BasicConfigurator9configureEv',
 +                                           'Return' => '1',
 +                                           'ShortName' => 'configure',
 +                                           'Source' => 'basicconfigurator.cpp',
 +                                           'SourceLine' => '26',
 +                                           'Static' => 1
 +                                         },
 +                            '1031886' => {
 +                                           'Class' => '1031832',
 +                                           'Header' => 'basicconfigurator.h',
 +                                           'Line' => '53',
 +                                           'MnglName' => '_ZN7log4cxx17BasicConfigurator9configureERKSt10shared_ptrINS_8AppenderEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'appender',
 +                                                                 'type' => '1032617'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1',
 +                                           'ShortName' => 'configure',
 +                                           'Source' => 'basicconfigurator.cpp',
 +                                           'SourceLine' => '36',
 +                                           'Static' => 1
 +                                         },
 +                            '1031910' => {
 +                                           'Class' => '1031832',
 +                                           'Header' => 'basicconfigurator.h',
 +                                           'Line' => '60',
 +                                           'MnglName' => '_ZN7log4cxx17BasicConfigurator18resetConfigurationEv',
 +                                           'Return' => '1',
 +                                           'ShortName' => 'resetConfiguration',
 +                                           'Source' => 'basicconfigurator.cpp',
 +                                           'SourceLine' => '42',
 +                                           'Static' => 1
 +                                         },
 +                            '1031992' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '54',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager21getRepositorySelectorEv',
 +                                           'Private' => 1,
 +                                           'Return' => '1031760',
 +                                           'ShortName' => 'getRepositorySelector',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '53',
 +                                           'Static' => 1
 +                                         },
 +                            '1032008' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '73',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager21setRepositorySelectorESt10shared_ptrINS_3spi18RepositorySelectorEEPv',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'selector',
 +                                                                 'type' => '1031760'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'guard1',
 +                                                                 'type' => '44905'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1',
 +                                           'ShortName' => 'setRepositorySelector',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '70',
 +                                           'Static' => 1
 +                                         },
 +                            '1032037' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '76',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager19getLoggerRepositoryEv',
 +                                           'Return' => '736897',
 +                                           'ShortName' => 'getLoggerRepository',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '89',
 +                                           'Static' => 1
 +                                         },
 +                            '1032055' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '81',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager13getRootLoggerEv',
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getRootLogger',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '94',
 +                                           'Static' => 1
 +                                         },
 +                            '1032073' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '88',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager9getLoggerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '55459'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getLogger',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '118',
 +                                           'Static' => 1
 +                                         },
 +                            '1032100' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '95',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager9getLoggerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt10shared_ptrINS_3spi13LoggerFactoryEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '55459'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'factory',
 +                                                                 'type' => '1033895'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getLogger',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '124',
 +                                           'Static' => 1
 +                                         },
 +                            '1032132' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '102',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager6existsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '55459'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'exists',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '131',
 +                                           'Static' => 1
 +                                         },
 +                            '1032159' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '109',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager9getLoggerERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '594235'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getLogger',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '138',
 +                                           'Static' => 1
 +                                         },
 +                            '1032186' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '116',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager9getLoggerERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEERKSt10shared_ptrINS_3spi13LoggerFactoryEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '594235'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'factory',
 +                                                                 'type' => '1033895'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getLogger',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '144',
 +                                           'Static' => 1
 +                                         },
 +                            '1032218' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '123',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager6existsERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '594235'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'exists',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '151',
 +                                           'Static' => 1
 +                                         },
 +                            '1032245' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '176',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager11getLoggerLSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '241824'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getLoggerLS',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '103',
 +                                           'Static' => 1
 +                                         },
 +                            '1032272' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '183',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager11getLoggerLSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt10shared_ptrINS_3spi13LoggerFactoryEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '241824'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'factory',
 +                                                                 'type' => '1033895'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'getLoggerLS',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '111',
 +                                           'Static' => 1
 +                                         },
 +                            '1032304' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '191',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager8existsLSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'name',
 +                                                                 'type' => '241824'
 +                                                               }
 +                                                      },
 +                                           'Return' => '1032378',
 +                                           'ShortName' => 'existsLS',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '200',
 +                                           'Static' => 1
 +                                         },
 +                            '1032331' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '193',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager17getCurrentLoggersEv',
 +                                           'Return' => '1032390',
 +                                           'ShortName' => 'getCurrentLoggers',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '205',
 +                                           'Static' => 1
 +                                         },
 +                            '1032349' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '199',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager8shutdownEv',
 +                                           'Return' => '1',
 +                                           'ShortName' => 'shutdown',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '210',
 +                                           'Static' => 1
 +                                         },
 +                            '1032363' => {
 +                                           'Class' => '1031955',
 +                                           'Header' => 'logmanager.h',
 +                                           'Line' => '205',
 +                                           'MnglName' => '_ZN7log4cxx10LogManager18resetConfigurationEv',
 +                                           'Return' => '1',
 +                                           'ShortName' => 'resetConfiguration',
 +                                           'Source' => 'logmanager.cpp',
 +                                           'SourceLine' => '216',
 +                                           'Static' => 1
 +                                         },
 +                            '10348521' => {
 +                                            'Class' => '10348364',
++=======
+                             '10438555' => {
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler5errorERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern23MessagePatternConverter8getClassEv',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349983'
++=======
+                                                                   'type' => '10439932'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'message',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'error',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '64',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '33',
                                              'Virt' => 1,
 -                                            'VirtPos' => '9'
 +                                            'VirtPos' => '0'
 +                                          },
++<<<<<<< HEAD
 +                            '10348560' => {
 +                                            'Class' => '10348364',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '33',
 +                                            'Static' => 1
 +                                          },
 +                            '10348578' => {
 +                                            'Class' => '10348364',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '33',
 +                                            'Static' => 1
                                            },
 +                            '10348596' => {
 +                                            'Class' => '10348364',
 +                                            'Const' => 1,
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern23MessagePatternConverter4castERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10349983'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                             '10438595' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler11setAppenderERKSt10shared_ptrINS_8AppenderEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439898'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '911511'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 -                                                     },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setAppender',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '74',
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
                                              'Virt' => 1,
 -                                            'VirtPos' => '11'
 +                                            'VirtPos' => '4'
                                            },
++<<<<<<< HEAD
 +                            '10348640' => {
 +                                            'Class' => '10348364',
 +                                            'Const' => 1,
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '48',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern23MessagePatternConverter10instanceofERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10349983'
++=======
+                             '10438635' => {
+                                             'Class' => '334408',
+                                             'Header' => 'onlyonceerrorhandler.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler17setBackupAppenderERKSt10shared_ptrINS_8AppenderEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10439898'
++>>>>>>> master
                                                                  },
                                                           '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10348684' => {
 +                                            'Class' => '10348364',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter11newInstanceERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS8_EE',
 +                                            'Param' => {
 +                                                         '0' => {
                                                                    'name' => 'p1',
++<<<<<<< HEAD
 +                                                                  'type' => '389696'
++=======
+                                                                   'type' => '911511'
++>>>>>>> master
                                                                  }
                                                         },
                                              'Reg' => {
 -                                                       '0' => 'rdi',
 -                                                       '1' => 'rsi'
 +                                                       '0' => 'rsi'
                                                       },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'setBackupAppender',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '79',
 -                                            'Virt' => 1,
 -                                            'VirtPos' => '12'
 +                                            'Return' => '1957741',
 +                                            'ShortName' => 'newInstance',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '41',
 +                                            'Static' => 1
                                            },
++<<<<<<< HEAD
 +                            '10348712' => {
 +                                            'Class' => '10348364',
++=======
+                             '10438795' => {
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 -                                            'InLine' => 2,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandler7getNameB5cxx11Ev',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern23MessagePatternConverter6formatERKSt10shared_ptrINS_3spi12LoggingEventEERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_7helpers4PoolE',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349983'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'event',
 +                                                                  'type' => '137116'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'toAppendTo',
 +                                                                  'type' => '388758'
 +                                                                },
 +                                                         '3' => {
 +                                                                  'name' => 'p3',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Reg' => {
 +                                                       '3' => 'rcx'
 +                                                     },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'format',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '48',
++=======
+                                                                   'type' => '10439978'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
++>>>>>>> master
                                              'Virt' => 1,
 -                                            'VirtPos' => '3'
 +                                            'VirtPos' => '7'
                                            },
++<<<<<<< HEAD
 +                            '10348882' => {
 +                                            'Class' => '10348762',
++=======
+                             '10438834' => {
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 2,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandler11newInstanceEv',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern23MessagePatternConverter28ClazzMessagePatternConverter7getNameB5cxx11Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10350017'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
++=======
+                                                                   'type' => '10439978'
+                                                                 }
+                                                        },
+                                             'Return' => '337021',
+                                             'ShortName' => 'newInstance',
++>>>>>>> master
                                              'Virt' => 1,
 -                                            'VirtPos' => '4'
 +                                            'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10349296' => {
++=======
+                             '10439351' => {
++>>>>>>> master
                                              'Data' => 1,
 -                                            'Line' => '27',
 -                                            'MnglName' => '_ZN7log4cxx7classes32OnlyOnceErrorHandlerRegistrationE',
 +                                            'Line' => '33',
 +                                            'MnglName' => '_ZN7log4cxx7classes35MessagePatternConverterRegistrationE',
                                              'NameSpace' => 'log4cxx::classes',
++<<<<<<< HEAD
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'MessagePatternConverterRegistration',
 +                                            'Source' => 'messagepatternconverter.cpp'
 +                                          },
 +                            '10351858' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348364',
++=======
+                                             'Return' => '53989',
+                                             'ShortName' => 'OnlyOnceErrorHandlerRegistration',
+                                             'Source' => 'onlyonceerrorhandler.cpp'
+                                           },
+                             '10440370' => {
+                                             'Artificial' => 1,
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '43',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandlerD0Ev',
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverterD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349742'
++=======
+                                                                   'type' => '10439898'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OnlyOnceErrorHandler',
 +                                            'ShortName' => 'MessagePatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10351859' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348364',
++=======
+                             '10440371' => {
+                                             'Artificial' => 1,
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '43',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandlerD2Ev',
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverterD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349742'
++=======
+                                                                   'type' => '10439898'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OnlyOnceErrorHandler',
 +                                            'ShortName' => 'MessagePatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10352123' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348364',
++=======
+                             '10441899' => {
+                                             'Artificial' => 1,
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '43',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandlerD1Ev',
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverterD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349742'
++=======
+                                                                   'type' => '10439898'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OnlyOnceErrorHandler',
 +                                            'ShortName' => 'MessagePatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10360560' => {
 +                                            'Class' => '10348364',
++=======
+                             '10447033' => {
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandlerC1Ev',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverterC1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349742'
++=======
+                                                                   'type' => '10439898'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OnlyOnceErrorHandler',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '29'
 +                                            'Private' => 1,
 +                                            'ShortName' => 'MessagePatternConverter',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '35'
                                            },
++<<<<<<< HEAD
 +                            '10364701' => {
 +                                            'Class' => '10348364',
++=======
+                             '10449281' => {
+                                             'Class' => '334408',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandlerC2Ev',
 +                                            'Header' => 'messagepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverterC2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10349742'
++=======
+                                                                   'type' => '10439898'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OnlyOnceErrorHandler',
 -                                            'Source' => 'onlyonceerrorhandler.cpp',
 -                                            'SourceLine' => '29'
 +                                            'Private' => 1,
 +                                            'ShortName' => 'MessagePatternConverter',
 +                                            'Source' => 'messagepatternconverter.cpp',
 +                                            'SourceLine' => '35'
                                            },
++<<<<<<< HEAD
 +                            '10370351' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348762',
++=======
+                             '10453027' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandlerD0Ev',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter28ClazzMessagePatternConverterD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10350000'
++=======
+                                                                   'type' => '10439961'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOnlyOnceErrorHandler',
 +                                            'ShortName' => 'ClazzMessagePatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10370352' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348762',
++=======
+                             '10453028' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandlerD1Ev',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter28ClazzMessagePatternConverterD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10350000'
++=======
+                                                                   'type' => '10439961'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOnlyOnceErrorHandler',
 +                                            'ShortName' => 'ClazzMessagePatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10370492' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348762',
++=======
+                             '10453168' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandlerD2Ev',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter28ClazzMessagePatternConverterD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10350000'
++=======
+                                                                   'type' => '10439961'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOnlyOnceErrorHandler',
 +                                            'ShortName' => 'ClazzMessagePatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10370582' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348762',
++=======
+                             '10453258' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandlerC2Ev',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter28ClazzMessagePatternConverterC2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10350000'
++=======
+                                                                   'type' => '10439961'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOnlyOnceErrorHandler'
 +                                            'ShortName' => 'ClazzMessagePatternConverter'
                                            },
++<<<<<<< HEAD
 +                            '10370583' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10348762',
++=======
+                             '10453259' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10438675',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'onlyonceerrorhandler.h',
 +                                            'Header' => 'messagepatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '53',
 -                                            'MnglName' => '_ZN7log4cxx7helpers20OnlyOnceErrorHandler25ClazzOnlyOnceErrorHandlerC1Ev',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern23MessagePatternConverter28ClazzMessagePatternConverterC1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10350000'
++=======
+                                                                   'type' => '10439961'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOnlyOnceErrorHandler'
 +                                            'ShortName' => 'ClazzMessagePatternConverter'
                                            },
++<<<<<<< HEAD
 +                            '10428887' => {
 +                                            'Class' => '10428730',
++=======
+                             '10528359' => {
+                                             'Class' => '10528346',
+                                             'Header' => 'system.h',
+                                             'Line' => '47',
+                                             'MnglName' => '_ZN7log4cxx7helpers6System11getPropertyERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'lkey',
+                                                                   'type' => '205852'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getProperty',
+                                             'Source' => 'system.cpp',
+                                             'SourceLine' => '32',
+                                             'Static' => 1
+                                           },
+                             '10529954' => {
+                                             'Header' => 'object.h',
+                                             'InLine' => 2,
+                                             'Line' => '122',
+                                             'MnglName' => '_ZN7log4cxx4castINS_3spi12ConfiguratorENS_7helpers6ObjectELb0ELb1EEESt10shared_ptrIT_ERKS5_IT0_E',
+                                             'NameSpace' => 'log4cxx',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'incoming',
+                                                                   'type' => '2975401'
+                                                                 }
+                                                        },
+                                             'Return' => '10505282',
+                                             'ShortName' => 'cast<log4cxx::spi::Configurator, log4cxx::helpers::Object>',
+                                             'TParam' => {
+                                                           '0' => {
+                                                                    'key' => 'Ret',
+                                                                    'type' => '2072645'
+                                                                  },
+                                                           '1' => {
+                                                                    'key' => 'Type',
+                                                                    'type' => '53165'
+                                                                  }
+                                                         }
+                                           },
+                             '1061498' => {
+                                            'Class' => '1061364',
+                                            'Header' => 'bytebuffer.h',
+                                            'Line' => '45',
+                                            'MnglName' => '_ZN7log4cxx7helpers10ByteBuffer5clearEv',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063108'
+                                                                }
+                                                       },
+                                            'Reg' => {
+                                                       '0' => 'rdi'
+                                                     },
+                                            'Return' => '1',
+                                            'ShortName' => 'clear',
+                                            'Source' => 'bytebuffer.cpp',
+                                            'SourceLine' => '34'
+                                          },
+                             '1061525' => {
+                                            'Class' => '1061364',
+                                            'Header' => 'bytebuffer.h',
+                                            'Line' => '46',
+                                            'MnglName' => '_ZN7log4cxx7helpers10ByteBuffer4flipEv',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063108'
+                                                                }
+                                                       },
+                                            'Reg' => {
+                                                       '0' => 'rdi'
+                                                     },
+                                            'Return' => '1',
+                                            'ShortName' => 'flip',
+                                            'Source' => 'bytebuffer.cpp',
+                                            'SourceLine' => '40'
+                                          },
+                             '1061707' => {
+                                            'Class' => '1061364',
+                                            'Header' => 'bytebuffer.h',
+                                            'Line' => '68',
+                                            'MnglName' => '_ZN7log4cxx7helpers10ByteBuffer5limitEm',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063108'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'newLimit',
+                                                                  'type' => '41030'
+                                                                }
+                                                       },
+                                            'Return' => '1',
+                                            'ShortName' => 'limit',
+                                            'Source' => 'bytebuffer.cpp',
+                                            'SourceLine' => '58'
+                                          },
+                             '1061801' => {
+                                            'Class' => '1061364',
+                                            'Header' => 'bytebuffer.h',
+                                            'Line' => '77',
+                                            'MnglName' => '_ZN7log4cxx7helpers10ByteBuffer8positionEm',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063108'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'newPosition',
+                                                                  'type' => '41030'
+                                                                }
+                                                       },
+                                            'Reg' => {
+                                                       '0' => 'rdi',
+                                                       '1' => 'rsi'
+                                                     },
+                                            'Return' => '1',
+                                            'ShortName' => 'position',
+                                            'Source' => 'bytebuffer.cpp',
+                                            'SourceLine' => '46'
+                                          },
+                             '1061833' => {
+                                            'Class' => '1061364',
+                                            'Header' => 'bytebuffer.h',
+                                            'Line' => '79',
+                                            'MnglName' => '_ZN7log4cxx7helpers10ByteBuffer3putEc',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063108'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'byte',
+                                                                  'type' => '41214'
+                                                                }
+                                                       },
+                                            'Reg' => {
+                                                       '0' => 'rdi',
+                                                       '1' => 'rsi'
+                                                     },
+                                            'Return' => '40888',
+                                            'ShortName' => 'put',
+                                            'Source' => 'bytebuffer.cpp',
+                                            'SourceLine' => '69'
+                                          },
+                             '1062126' => {
+                                            'Class' => '1062075',
+                                            'Const' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZNK7log4cxx7helpers20ByteArrayInputStream8getClassEv',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063720'
+                                                                }
+                                                       },
+                                            'Return' => '53983',
+                                            'ShortName' => 'getClass',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '29',
+                                            'Virt' => 1,
+                                            'VirtPos' => '0'
+                                          },
+                             '1062165' => {
+                                            'Class' => '1062075',
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream14getStaticClassEv',
+                                            'Return' => '53983',
+                                            'ShortName' => 'getStaticClass',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '29',
+                                            'Static' => 1
+                                          },
+                             '1062183' => {
+                                            'Class' => '1062075',
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream13registerClassEv',
+                                            'Return' => '53989',
+                                            'ShortName' => 'registerClass',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '29',
+                                            'Static' => 1
+                                          },
+                             '1062201' => {
+                                            'Class' => '1062075',
+                                            'Const' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 2,
+                                            'Line' => '49',
+                                            'MnglName' => '_ZNK7log4cxx7helpers20ByteArrayInputStream4castERKNS0_5ClassE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063720'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'clazz',
+                                                                  'type' => '53983'
+                                                                }
+                                                       },
+                                            'Return' => '44634',
+                                            'ShortName' => 'cast',
+                                            'Virt' => 1,
+                                            'VirtPos' => '4'
+                                          },
+                             '1062245' => {
+                                            'Class' => '1062075',
+                                            'Const' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 2,
+                                            'Line' => '52',
+                                            'MnglName' => '_ZNK7log4cxx7helpers20ByteArrayInputStream10instanceofERKNS0_5ClassE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063720'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'clazz',
+                                                                  'type' => '53983'
+                                                                }
+                                                       },
+                                            'Return' => '40888',
+                                            'ShortName' => 'instanceof',
+                                            'Virt' => 1,
+                                            'VirtPos' => '3'
+                                          },
+                             '1062359' => {
+                                            'Class' => '1062075',
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream5closeEv',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                }
+                                                       },
+                                            'Reg' => {
+                                                       '0' => 'rdi'
+                                                     },
+                                            'Return' => '1',
+                                            'ShortName' => 'close',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '43',
+                                            'Virt' => 1,
+                                            'VirtPos' => '6'
+                                          },
+                             '1062395' => {
+                                            'Class' => '1062075',
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream4readERNS0_10ByteBufferE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'dst',
+                                                                  'type' => '1062818'
+                                                                }
+                                                       },
+                                            'Return' => '40835',
+                                            'ShortName' => 'read',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '48',
+                                            'Virt' => 1,
+                                            'VirtPos' => '5'
+                                          },
+                             '1062626' => {
+                                            'Class' => '1062505',
+                                            'Const' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 2,
+                                            'Line' => '48',
+                                            'MnglName' => '_ZNK7log4cxx7helpers20ByteArrayInputStream25ClazzByteArrayInputStream7getNameB5cxx11Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063771'
+                                                                }
+                                                       },
+                                            'Return' => '53185',
+                                            'ShortName' => 'getName',
+                                            'Virt' => 1,
+                                            'VirtPos' => '3'
+                                          },
+                             '1062684' => {
+                                            'Class' => '1062674',
+                                            'Const' => 1,
+                                            'Header' => 'inputstream.h',
+                                            'InLine' => 2,
+                                            'Line' => '38',
+                                            'MnglName' => '_ZNK7log4cxx7helpers11InputStream4castERKNS0_5ClassE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1073974'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'clazz',
+                                                                  'type' => '53983'
+                                                                }
+                                                       },
+                                            'Return' => '44634',
+                                            'ShortName' => 'cast',
+                                            'Virt' => 1,
+                                            'VirtPos' => '4'
+                                          },
+                             '1062728' => {
+                                            'Class' => '1062674',
+                                            'Header' => 'inputstream.h',
+                                            'Line' => '37',
+                                            'MnglName' => '_ZN7log4cxx7helpers11InputStream14getStaticClassEv',
+                                            'Private' => 1,
+                                            'Return' => '53983',
+                                            'ShortName' => 'getStaticClass',
+                                            'Source' => 'inputstream.cpp',
+                                            'SourceLine' => '24',
+                                            'Static' => 1
+                                          },
+                             '1062799' => {
+                                            'Data' => 1,
+                                            'Line' => '29',
+                                            'MnglName' => '_ZN7log4cxx7classes32ByteArrayInputStreamRegistrationE',
+                                            'NameSpace' => 'log4cxx::classes',
+                                            'Return' => '53989',
+                                            'ShortName' => 'ByteArrayInputStreamRegistration',
+                                            'Source' => 'bytearrayinputstream.cpp'
+                                          },
+                             '1069308' => {
+                                            'Class' => '1062075',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStreamD0Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayInputStream',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '38',
+                                            'Virt' => 1
+                                          },
+                             '1069309' => {
+                                            'Class' => '1062075',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStreamD1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayInputStream',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '38',
+                                            'Virt' => 1
+                                          },
+                             '1069403' => {
+                                            'Class' => '1062075',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStreamD2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayInputStream',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '38',
+                                            'Virt' => 1
+                                          },
+                             '1070132' => {
+                                            'Class' => '1062075',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStreamC2ERKSt6vectorIhSaIhEE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'bytes',
+                                                                  'type' => '1063067'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayInputStream',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '31'
+                                          },
+                             '1070133' => {
+                                            'Class' => '1062075',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStreamC1ERKSt6vectorIhSaIhEE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063731'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'bytes',
+                                                                  'type' => '1063067'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayInputStream',
+                                            'Source' => 'bytearrayinputstream.cpp',
+                                            'SourceLine' => '31'
+                                          },
+                             '1073714' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1062505',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '48',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream25ClazzByteArrayInputStreamD0Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063754'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayInputStream',
+                                            'Virt' => 1
+                                          },
+                             '1073715' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1062505',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '48',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream25ClazzByteArrayInputStreamD1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063754'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayInputStream',
+                                            'Virt' => 1
+                                          },
+                             '1073855' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1062505',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '48',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream25ClazzByteArrayInputStreamD2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063754'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayInputStream',
+                                            'Virt' => 1
+                                          },
+                             '1073945' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1062505',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '48',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream25ClazzByteArrayInputStreamC2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063754'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayInputStream'
+                                          },
+                             '1073946' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1062505',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayinputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '48',
+                                            'MnglName' => '_ZN7log4cxx7helpers20ByteArrayInputStream25ClazzByteArrayInputStreamC1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1063754'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayInputStream'
+                                          },
+                             '10740384' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstream.h',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers12OutputStream8getClassEv',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern30MethodLocationPatternConverter8getClassEv',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430807'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
++=======
+                                                                   'type' => '1149927'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
++>>>>>>> master
                                              'ShortName' => 'getClass',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '25',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '33',
                                              'Virt' => 1,
                                              'VirtPos' => '0'
                                            },
++<<<<<<< HEAD
 +                            '10428926' => {
 +                                            'Class' => '10428730',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '33',
 +                                            'Static' => 1
 +                                          },
 +                            '10428944' => {
 +                                            'Class' => '10428730',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter13registerClassEv',
 +                                            'Return' => '57922',
++=======
+                             '10740441' => {
+                                             'Class' => '1133942',
+                                             'Header' => 'outputstream.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers12OutputStream13registerClassEv',
+                                             'Return' => '53989',
++>>>>>>> master
                                              'ShortName' => 'registerClass',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '25',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '33',
                                              'Static' => 1
                                            },
++<<<<<<< HEAD
 +                            '10428962' => {
 +                                            'Class' => '10428730',
++=======
+                             '10740503' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 2,
 -                                            'Line' => '42',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers12OutputStream10instanceofERKNS0_5ClassE',
 +                                            'Line' => '46',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern30MethodLocationPatternConverter4castERKNS_7helpers5ClassE',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430807'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
++=======
+                                                                   'type' => '1149927'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
+                                             'ShortName' => 'instanceof',
++>>>>>>> master
                                              'Virt' => 1,
 -                                            'VirtPos' => '3'
 +                                            'VirtPos' => '4'
                                            },
++<<<<<<< HEAD
 +                            '10429006' => {
 +                                            'Class' => '10428730',
 +                                            'Const' => 1,
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'InLine' => 2,
++=======
+                             '10740611' => {
+                                             'Class' => '1133942',
+                                             'Header' => 'outputstream.h',
++>>>>>>> master
                                              'Line' => '49',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream5closeERNS0_4PoolE',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern30MethodLocationPatternConverter10instanceofERKNS_7helpers5ClassE',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430807'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                                                                   'type' => '4517594'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'PureVirt' => 1,
 -                                            'Return' => '1',
 -                                            'ShortName' => 'close',
 -                                            'VirtPos' => '5'
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10429050' => {
 +                                            'Class' => '10428730',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter11newInstanceERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS8_EE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '389696'
++=======
+                             '10740651' => {
+                                             'Class' => '1133942',
+                                             'Header' => 'outputstream.h',
+                                             'Line' => '50',
+                                             'MnglName' => '_ZN7log4cxx7helpers12OutputStream5flushERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '4517594'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'PureVirt' => 1,
 -                                            'Return' => '1',
 -                                            'ShortName' => 'flush',
 -                                            'VirtPos' => '6'
 +                                            'Reg' => {
 +                                                       '0' => 'rsi'
 +                                                     },
 +                                            'Return' => '1957741',
 +                                            'ShortName' => 'newInstance',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '41',
 +                                            'Static' => 1
                                            },
++<<<<<<< HEAD
 +                            '10429078' => {
 +                                            'Class' => '10428730',
 +                                            'Const' => 1,
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern30MethodLocationPatternConverter6formatERKSt10shared_ptrINS_3spi12LoggingEventEERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_7helpers4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10430807'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'event',
 +                                                                  'type' => '137116'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'toAppendTo',
 +                                                                  'type' => '388758'
 +                                                                },
 +                                                         '3' => {
 +                                                                  'name' => 'p3',
 +                                                                  'type' => '57881'
++=======
+                             '10740691' => {
+                                             'Class' => '1133942',
+                                             'Header' => 'outputstream.h',
+                                             'Line' => '51',
+                                             'MnglName' => '_ZN7log4cxx7helpers12OutputStream5writeERNS0_10ByteBufferERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '4517594'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '1062818'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p2',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'PureVirt' => 1,
 +                                            'Reg' => {
 +                                                       '3' => 'rcx'
 +                                                     },
                                              'Return' => '1',
 -                                            'ShortName' => 'write',
 +                                            'ShortName' => 'format',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '48',
 +                                            'Virt' => 1,
                                              'VirtPos' => '7'
                                            },
++<<<<<<< HEAD
 +                            '10429248' => {
 +                                            'Class' => '10429128',
++=======
+                             '10740922' => {
+                                             'Class' => '10740802',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 2,
 -                                            'Line' => '39',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers12OutputStream17ClazzOutputStream7getNameB5cxx11Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern30MethodLocationPatternConverter35ClazzMethodLocationPatternConverter7getNameB5cxx11Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430841'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
++=======
+                                                                   'type' => '10741303'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
++>>>>>>> master
                                              'ShortName' => 'getName',
                                              'Virt' => 1,
                                              'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10430090' => {
++=======
+                             '10741073' => {
++>>>>>>> master
                                              'Data' => 1,
 -                                            'Line' => '25',
 -                                            'MnglName' => '_ZN7log4cxx7classes24OutputStreamRegistrationE',
 +                                            'Line' => '33',
 +                                            'MnglName' => '_ZN7log4cxx7classes42MethodLocationPatternConverterRegistrationE',
                                              'NameSpace' => 'log4cxx::classes',
++<<<<<<< HEAD
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'MethodLocationPatternConverterRegistration',
 +                                            'Source' => 'methodlocationpatternconverter.cpp'
 +                                          },
 +                            '10432682' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10428730',
++=======
+                                             'Return' => '53989',
+                                             'ShortName' => 'OutputStreamRegistration',
+                                             'Source' => 'outputstream.cpp'
+                                           },
+                             '10744250' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstream.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStreamD0Ev',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverterD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430566'
++=======
+                                                                   'type' => '10741263'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'OutputStream',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '31',
 +                                            'ShortName' => 'MethodLocationPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10432683' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10428730',
++=======
+                             '10744251' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstream.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStreamD1Ev',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverterD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430566'
++=======
+                                                                   'type' => '10741263'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'OutputStream',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '31',
 +                                            'ShortName' => 'MethodLocationPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10432947' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10428730',
++=======
+                             '10744345' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstream.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStreamD2Ev',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverterD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430566'
++=======
+                                                                   'type' => '10741263'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'Reg' => {
 -                                                       '0' => 'rdi'
 -                                                     },
 -                                            'ShortName' => 'OutputStream',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '31',
 +                                            'ShortName' => 'MethodLocationPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10439749' => {
 +                                            'Class' => '10428730',
++=======
+                             '10744460' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'outputstream.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStreamC2Ev',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverterC1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430566'
++=======
+                                                                   'type' => '10741263'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'Reg' => {
 -                                                       '0' => 'rdi'
 -                                                     },
 -                                            'ShortName' => 'OutputStream',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '27'
 +                                            'Private' => 1,
 +                                            'ShortName' => 'MethodLocationPatternConverter',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '35'
                                            },
++<<<<<<< HEAD
 +                            '10443890' => {
 +                                            'Class' => '10428730',
++=======
+                             '10744461' => {
+                                             'Class' => '1133942',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'outputstream.h',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStreamC1Ev',
 +                                            'Header' => 'methodlocationpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverterC2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430566'
++=======
+                                                                   'type' => '10741263'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'Reg' => {
 -                                                       '0' => 'rdi'
 -                                                     },
 -                                            'ShortName' => 'OutputStream',
 -                                            'Source' => 'outputstream.cpp',
 -                                            'SourceLine' => '27'
 +                                            'Private' => 1,
 +                                            'ShortName' => 'MethodLocationPatternConverter',
 +                                            'Source' => 'methodlocationpatternconverter.cpp',
 +                                            'SourceLine' => '35'
                                            },
++<<<<<<< HEAD
 +                            '10449540' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10429128',
++=======
+                             '10746141' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10740802',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '39',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream17ClazzOutputStreamD0Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter35ClazzMethodLocationPatternConverterD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430824'
++=======
+                                                                   'type' => '10741286'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStream',
 +                                            'ShortName' => 'ClazzMethodLocationPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10449541' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10429128',
++=======
+                             '10746142' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10740802',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '39',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream17ClazzOutputStreamD1Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter35ClazzMethodLocationPatternConverterD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430824'
++=======
+                                                                   'type' => '10741286'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStream',
 +                                            'ShortName' => 'ClazzMethodLocationPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10449681' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10429128',
++=======
+                             '10746282' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10740802',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '39',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream17ClazzOutputStreamD2Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter35ClazzMethodLocationPatternConverterD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430824'
++=======
+                                                                   'type' => '10741286'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStream',
 +                                            'ShortName' => 'ClazzMethodLocationPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10449771' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10429128',
++=======
+                             '10746372' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10740802',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '39',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream17ClazzOutputStreamC2Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter35ClazzMethodLocationPatternConverterC2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430824'
++=======
+                                                                   'type' => '10741286'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStream'
 +                                            'ShortName' => 'ClazzMethodLocationPatternConverter'
                                            },
++<<<<<<< HEAD
 +                            '10449772' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10429128',
++=======
+                             '10746373' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10740802',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'outputstream.h',
 +                                            'Header' => 'methodlocationpatternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '39',
 -                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream17ClazzOutputStreamC1Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern30MethodLocationPatternConverter35ClazzMethodLocationPatternConverterC1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10430824'
++=======
+                                                                   'type' => '10741286'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStream'
 +                                            'ShortName' => 'ClazzMethodLocationPatternConverter'
                                            },
++<<<<<<< HEAD
 +                            '10515812' => {
 +                                            'Class' => '10515759',
++=======
+                             '10802769' => {
+                                             'Class' => '10802719',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers18OutputStreamWriter8getClassEv',
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern15NameAbbreviator8getClassEv',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518951'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
++=======
+                                                                   'type' => '10804441'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
++>>>>>>> master
                                              'ShortName' => 'getClass',
 -                                            'Source' => 'outputstreamwriter.cpp',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'SourceLine' => '28',
                                              'Virt' => 1,
                                              'VirtPos' => '0'
                                            },
++<<<<<<< HEAD
 +                            '10515851' => {
 +                                            'Class' => '10515759',
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator14getStaticClassEv',
 +                                            'Return' => '57916',
++=======
+                             '10802808' => {
+                                             'Class' => '10802719',
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter14getStaticClassEv',
+                                             'Return' => '53983',
++>>>>>>> master
                                              'ShortName' => 'getStaticClass',
 -                                            'Source' => 'outputstreamwriter.cpp',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'SourceLine' => '28',
                                              'Static' => 1
                                            },
++<<<<<<< HEAD
 +                            '10515869' => {
 +                                            'Class' => '10515759',
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator13registerClassEv',
 +                                            'Return' => '57922',
++=======
+                             '10802826' => {
+                                             'Class' => '10802719',
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter13registerClassEv',
+                                             'Return' => '53989',
++>>>>>>> master
                                              'ShortName' => 'registerClass',
 -                                            'Source' => 'outputstreamwriter.cpp',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'SourceLine' => '28',
                                              'Static' => 1
                                            },
++<<<<<<< HEAD
 +                            '10515887' => {
 +                                            'Class' => '10515759',
++=======
+                             '10802844' => {
+                                             'Class' => '10802719',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
 +                                            'Header' => 'nameabbreviator.h',
                                              'InLine' => 2,
                                              'Line' => '42',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers18OutputStreamWriter4castERKNS0_5ClassE',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern15NameAbbreviator4castERKNS_7helpers5ClassE',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518951'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '48436',
++=======
+                                                                   'type' => '10804441'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '44634',
++>>>>>>> master
                                              'ShortName' => 'cast',
                                              'Virt' => 1,
                                              'VirtPos' => '4'
                                            },
++<<<<<<< HEAD
 +                            '10515931' => {
 +                                            'Class' => '10515759',
++=======
+                             '10802888' => {
+                                             'Class' => '10802719',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
 +                                            'Header' => 'nameabbreviator.h',
                                              'InLine' => 2,
 -                                            'Line' => '45',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers18OutputStreamWriter10instanceofERKNS0_5ClassE',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern15NameAbbreviator10instanceofERKNS_7helpers5ClassE',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518951'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '44689',
++=======
+                                                                   'type' => '10804441'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
++>>>>>>> master
                                              'ShortName' => 'instanceof',
                                              'Virt' => 1,
                                              'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10516039' => {
 +                                            'Class' => '10515759',
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'Line' => '63',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator14getAbbreviatorERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'pattern',
 +                                                                  'type' => '241824'
 +                                                                }
 +                                                       },
 +                                            'Return' => '10517883',
 +                                            'ShortName' => 'getAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '267',
 +                                            'Static' => 1
 +                                          },
 +                            '10516068' => {
 +                                            'Class' => '10515759',
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'Line' => '70',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator21getDefaultAbbreviatorEv',
 +                                            'Return' => '10517883',
 +                                            'ShortName' => 'getDefaultAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '363',
 +                                            'Static' => 1
 +                                          },
 +                            '10516086' => {
 +                                            'Class' => '10515759',
 +                                            'Const' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'Line' => '78',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern15NameAbbreviator10abbreviateEmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518945'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '281'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p2',
 +                                                                  'type' => '388758'
++=======
+                             '10803039' => {
+                                             'Class' => '10802719',
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter5closeERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 +                                            'PureVirt' => 1,
                                              'Return' => '1',
 -                                            'ShortName' => 'close',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '58',
 -                                            'Virt' => 1,
 +                                            'ShortName' => 'abbreviate',
                                              'VirtPos' => '5'
                                            },
++<<<<<<< HEAD
 +                            '10516251' => {
 +                                            'Class' => '10516131',
 +                                            'Const' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern15NameAbbreviator20ClazzNameAbbreviator7getNameB5cxx11Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518979'
++=======
+                             '10803079' => {
+                                             'Class' => '10802719',
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter5flushERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'flush',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '63',
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
                                              'Virt' => 1,
 -                                            'VirtPos' => '6'
 +                                            'VirtPos' => '3'
 +                                          },
++<<<<<<< HEAD
 +                            '10516394' => {
 +                                            'Class' => '10516299',
 +                                            'Const' => 1,
 +                                            'Line' => '262',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern21MaxElementAbbreviator8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518827'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '0'
 +                                          },
 +                            '10516434' => {
 +                                            'Class' => '10516299',
 +                                            'Line' => '262',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviator14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Static' => 1
                                            },
 +                            '10516452' => {
 +                                            'Class' => '10516299',
 +                                            'Line' => '262',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviator13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Static' => 1
 +                                          },
 +                            '10516470' => {
 +                                            'Class' => '10516299',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '82',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern21MaxElementAbbreviator4castERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518827'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '4'
 +                                          },
 +                            '10516514' => {
 +                                            'Class' => '10516299',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '85',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern21MaxElementAbbreviator10instanceofERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518827'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10516590' => {
 +                                            'Class' => '10516299',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '99',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern21MaxElementAbbreviator10abbreviateEmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518827'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'nameStart',
 +                                                                  'type' => '281'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'buf',
 +                                                                  'type' => '388758'
++=======
+                             '10803119' => {
+                                             'Class' => '10802719',
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter5writeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS0_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'str',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
                                              'Return' => '1',
 -                                            'ShortName' => 'write',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '68',
 +                                            'ShortName' => 'abbreviate',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1,
 -                                            'VirtPos' => '7'
 +                                            'VirtPos' => '5'
                                            },
++<<<<<<< HEAD
 +                            '10516755' => {
 +                                            'Class' => '10516635',
++=======
+                             '10803382' => {
+                                             'Class' => '10803261',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
                                              'InLine' => 2,
 -                                            'Line' => '41',
 -                                            'MnglName' => '_ZNK7log4cxx7helpers18OutputStreamWriter23ClazzOutputStreamWriter7getNameB5cxx11Ev',
 +                                            'Line' => '81',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern21MaxElementAbbreviator26ClazzMaxElementAbbreviator7getNameB5cxx11Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518906'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
++=======
+                                                                   'type' => '10804504'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
++>>>>>>> master
                                              'ShortName' => 'getName',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1,
                                              'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10516928' => {
 +                                            'Class' => '10516833',
 +                                            'Const' => 1,
 +                                            'Line' => '263',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern18PatternAbbreviator8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518804'
++=======
+                             '10803954' => {
+                                             'Data' => 1,
+                                             'Line' => '28',
+                                             'MnglName' => '_ZN7log4cxx7classes30OutputStreamWriterRegistrationE',
+                                             'NameSpace' => 'log4cxx::classes',
+                                             'Return' => '53989',
+                                             'ShortName' => 'OutputStreamWriterRegistration',
+                                             'Source' => 'outputstreamwriter.cpp'
+                                           },
+                             '10811745' => {
+                                             'Class' => '10802719',
+                                             'Destructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '54',
 -                                            'Virt' => 1
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '0'
 +                                          },
++<<<<<<< HEAD
 +                            '10516968' => {
 +                                            'Class' => '10516833',
 +                                            'Line' => '263',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviator14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Static' => 1
                                            },
 +                            '10516986' => {
 +                                            'Class' => '10516833',
 +                                            'Line' => '263',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviator13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Static' => 1
 +                                          },
 +                            '10517004' => {
 +                                            'Class' => '10516833',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '210',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern18PatternAbbreviator4castERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518804'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                             '10811746' => {
+                                             'Class' => '10802719',
+                                             'Destructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '54',
 -                                            'Virt' => 1
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '4'
                                            },
++<<<<<<< HEAD
 +                            '10517048' => {
 +                                            'Class' => '10516833',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '213',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern18PatternAbbreviator10instanceofERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518804'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                             '10811840' => {
+                                             'Class' => '10802719',
+                                             'Destructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '54',
 -                                            'Virt' => 1
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10517124' => {
 +                                            'Class' => '10516833',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '233',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern18PatternAbbreviator10abbreviateEmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518804'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'nameStart',
 +                                                                  'type' => '281'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'buf',
 +                                                                  'type' => '388758'
++=======
+                             '10813277' => {
+                                             'Class' => '10802719',
+                                             'Constructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterC2ERSt10shared_ptrINS0_12OutputStreamEERS2_INS0_14CharsetEncoderEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'out1',
+                                                                   'type' => '10804457'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'enc1',
+                                                                   'type' => '1509650'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '39'
 +                                            'Return' => '1',
 +                                            'ShortName' => 'abbreviate',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '5'
 +                                          },
++<<<<<<< HEAD
 +                            '10517289' => {
 +                                            'Class' => '10517169',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '209',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern18PatternAbbreviator23ClazzPatternAbbreviator7getNameB5cxx11Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518878'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10517449' => {
 +                                            'Class' => '10517367',
 +                                            'Const' => 1,
 +                                            'Line' => '261',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern14NOPAbbreviator8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518850'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '0'
 +                                          },
 +                            '10517489' => {
 +                                            'Class' => '10517367',
 +                                            'Line' => '261',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviator14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Static' => 1
 +                                          },
 +                            '10517507' => {
 +                                            'Class' => '10517367',
 +                                            'Line' => '261',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviator13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Static' => 1
                                            },
 +                            '10517525' => {
 +                                            'Class' => '10517367',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '49',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern14NOPAbbreviator4castERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518850'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                             '10813278' => {
+                                             'Class' => '10802719',
+                                             'Constructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterC1ERSt10shared_ptrINS0_12OutputStreamEERS2_INS0_14CharsetEncoderEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'out1',
+                                                                   'type' => '10804457'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'enc1',
+                                                                   'type' => '1509650'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '39'
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '4'
                                            },
++<<<<<<< HEAD
 +                            '10517569' => {
 +                                            'Class' => '10517367',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '52',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern14NOPAbbreviator10instanceofERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518850'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                             '10818254' => {
+                                             'Class' => '10802719',
+                                             'Constructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterC2ERSt10shared_ptrINS0_12OutputStreamEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'out1',
+                                                                   'type' => '10804457'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '30'
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
                                            },
++<<<<<<< HEAD
 +                            '10517640' => {
 +                                            'Class' => '10517367',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '64',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern14NOPAbbreviator10abbreviateEmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518850'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '281'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p2',
 +                                                                  'type' => '388758'
++=======
+                             '10818255' => {
+                                             'Class' => '10802719',
+                                             'Constructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
+                                             'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriterC1ERSt10shared_ptrINS0_12OutputStreamEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10804452'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'out1',
+                                                                   'type' => '10804457'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'OutputStreamWriter',
 -                                            'Source' => 'outputstreamwriter.cpp',
 -                                            'SourceLine' => '30'
 +                                            'Reg' => {
 +                                                       '0' => 'rdi',
 +                                                       '1' => 'rsi',
 +                                                       '2' => 'rdx'
 +                                                     },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'abbreviate',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '5'
                                            },
 +                            '10517805' => {
 +                                            'Class' => '10517685',
 +                                            'Const' => 1,
 +                                            'InLine' => 2,
 +                                            'Line' => '48',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern14NOPAbbreviator19ClazzNOPAbbreviator7getNameB5cxx11Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518934'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10517905' => {
 +                                            'Data' => 1,
 +                                            'Line' => '28',
 +                                            'MnglName' => '_ZN7log4cxx7classes27NameAbbreviatorRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'NameAbbreviatorRegistration',
 +                                            'Source' => 'nameabbreviator.cpp'
 +                                          },
 +                            '10517922' => {
 +                                            'Data' => 1,
 +                                            'Line' => '261',
 +                                            'MnglName' => '_ZN7log4cxx7classes26NOPAbbreviatorRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'NOPAbbreviatorRegistration',
 +                                            'Source' => 'nameabbreviator.cpp'
 +                                          },
 +                            '10517940' => {
 +                                            'Data' => 1,
 +                                            'Line' => '262',
 +                                            'MnglName' => '_ZN7log4cxx7classes33MaxElementAbbreviatorRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'MaxElementAbbreviatorRegistration',
 +                                            'Source' => 'nameabbreviator.cpp'
 +                                          },
++<<<<<<< HEAD
 +                            '10517958' => {
 +                                            'Data' => 1,
 +                                            'Line' => '263',
 +                                            'MnglName' => '_ZN7log4cxx7classes30PatternAbbreviatorRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'PatternAbbreviatorRegistration',
 +                                            'Source' => 'nameabbreviator.cpp'
 +                                          },
 +                            '10523479' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517367',
++=======
+                             '10822895' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10803261',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
                                              'InLine' => 1,
 -                                            'Line' => '41',
 -                                            'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter23ClazzOutputStreamWriterD0Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviatorD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518608'
++=======
+                                                                   'type' => '10804487'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStreamWriter',
 +                                            'ShortName' => 'NOPAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10523480' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517367',
++=======
+                             '10822896' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10803261',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
                                              'InLine' => 1,
 -                                            'Line' => '41',
 -                                            'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter23ClazzOutputStreamWriterD1Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviatorD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518608'
++=======
+                                                                   'type' => '10804487'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStreamWriter',
 +                                            'ShortName' => 'NOPAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10523625' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517367',
++=======
+                             '10823036' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10803261',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'outputstreamwriter.h',
                                              'InLine' => 1,
 -                                            'Line' => '41',
 -                                            'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter23ClazzOutputStreamWriterD2Ev',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviatorD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518608'
++=======
+                                                                   'type' => '10804487'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStreamWriter',
 +                                            'ShortName' => 'NOPAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10523814' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516833',
 +                                            'Destructor' => 1,
++=======
+                             '10823126' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10803261',
+                                             'Constructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
++>>>>>>> master
                                              'InLine' => 1,
 -                                            'Line' => '41',
 -                                            'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter23ClazzOutputStreamWriterC2Ev',
 +                                            'Line' => '201',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviatorD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518597'
++=======
+                                                                   'type' => '10804487'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStreamWriter'
 +                                            'ShortName' => 'PatternAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10523815' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516833',
 +                                            'Destructor' => 1,
++=======
+                             '10823127' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10803261',
+                                             'Constructor' => 1,
+                                             'Header' => 'outputstreamwriter.h',
++>>>>>>> master
                                              'InLine' => 1,
 -                                            'Line' => '41',
 -                                            'MnglName' => '_ZN7log4cxx7helpers18OutputStreamWriter23ClazzOutputStreamWriterC1Ev',
 +                                            'Line' => '201',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviatorD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518597'
++=======
+                                                                   'type' => '10804487'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzOutputStreamWriter'
 +                                            'ShortName' => 'PatternAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
 +                                          },
++<<<<<<< HEAD
 +                            '10524599' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516833',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '201',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviatorD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518597'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'PatternAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
                                            },
 +                            '10526026' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516299',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '73',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviatorD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518586'
++=======
+                             '10886079' => {
+                                             'Class' => '1791943',
+                                             'Const' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'MnglName' => '_ZNK7log4cxx7pattern16PatternConverter8getClassEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '1814904'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
+                                             'ShortName' => 'getClass',
+                                             'Source' => 'patternconverter.cpp',
+                                             'SourceLine' => '28',
+                                             'Virt' => 1,
+                                             'VirtPos' => '0'
+                                           },
+                             '10886136' => {
+                                             'Class' => '1791943',
+                                             'Header' => 'patternconverter.h',
+                                             'MnglName' => '_ZN7log4cxx7pattern16PatternConverter13registerClassEv',
+                                             'Return' => '53989',
+                                             'ShortName' => 'registerClass',
+                                             'Source' => 'patternconverter.cpp',
+                                             'SourceLine' => '28',
+                                             'Static' => 1
+                                           },
+                             '10886242' => {
+                                             'Class' => '1791943',
+                                             'Const' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'Line' => '87',
+                                             'MnglName' => '_ZNK7log4cxx7pattern16PatternConverter6formatERKSt10shared_ptrINS_7helpers6ObjectEERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS3_4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '1814898'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '654616'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'p2',
+                                                                   'type' => '336206'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'p3',
+                                                                   'type' => '53948'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'PureVirt' => 1,
 -                                            'Return' => '1',
 -                                            'ShortName' => 'format',
 -                                            'VirtPos' => '5'
 +                                            'ShortName' => 'MaxElementAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
 +                                          },
++<<<<<<< HEAD
 +                            '10526027' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516299',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '73',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviatorD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518586'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MaxElementAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
 +                                          },
 +                            '10526172' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516299',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '73',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviatorD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518586'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'MaxElementAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
 +                                          },
 +                            '10559374' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517169',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '209',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviator23ClazzPatternAbbreviatorD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518861'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzPatternAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
                                            },
 +                            '10559375' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517169',
++=======
+                             '10886293' => {
+                                             'Class' => '1791943',
+                                             'Const' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'MnglName' => '_ZNK7log4cxx7pattern16PatternConverter7getNameB5cxx11Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '1814904'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
+                                             'Source' => 'patternconverter.cpp',
+                                             'SourceLine' => '40'
+                                           },
+                             '10886324' => {
+                                             'Class' => '1791943',
+                                             'Const' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'MnglName' => '_ZNK7log4cxx7pattern16PatternConverter13getStyleClassB5cxx11ERKSt10shared_ptrINS_7helpers6ObjectEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '1814904'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '654616'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '1' => 'rdx'
+                                                      },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getStyleClass',
+                                             'Source' => 'patternconverter.cpp',
+                                             'SourceLine' => '45',
+                                             'Virt' => 1,
+                                             'VirtPos' => '6'
+                                           },
+                             '10886517' => {
+                                             'Class' => '10886396',
+                                             'Const' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'InLine' => 2,
+                                             'Line' => '76',
+                                             'MnglName' => '_ZNK7log4cxx7pattern16PatternConverter21ClazzPatternConverter7getNameB5cxx11Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10886925'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '10886575' => {
+                                             'Data' => 1,
+                                             'Line' => '28',
+                                             'MnglName' => '_ZN7log4cxx7classes28PatternConverterRegistrationE',
+                                             'NameSpace' => 'log4cxx::classes',
+                                             'Return' => '53989',
+                                             'ShortName' => 'PatternConverterRegistration',
+                                             'Source' => 'patternconverter.cpp'
+                                           },
+                             '10898937' => {
+                                             'Class' => '1791943',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternconverter.h',
 -                                            'MnglName' => '_ZN7log4cxx7pattern16PatternConverterD0Ev',
 +                                            'InLine' => 1,
 +                                            'Line' => '209',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviator23ClazzPatternAbbreviatorD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518861'
++=======
+                                                                   'type' => '10886863'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'PatternConverter',
 -                                            'Source' => 'patternconverter.cpp',
 -                                            'SourceLine' => '36',
 +                                            'ShortName' => 'ClazzPatternAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10559516' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517169',
++=======
+                             '10899036' => {
+                                             'Class' => '1791943',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternconverter.h',
 -                                            'MnglName' => '_ZN7log4cxx7pattern16PatternConverterD1Ev',
 +                                            'InLine' => 1,
 +                                            'Line' => '209',
 +                                            'MnglName' => '_ZN7log4cxx7pattern18PatternAbbreviator23ClazzPatternAbbreviatorD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518861'
++=======
+                                                                   'type' => '10886863'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'PatternConverter',
 -                                            'Source' => 'patternconverter.cpp',
 -                                            'SourceLine' => '36',
 +                                            'ShortName' => 'ClazzPatternAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10562675' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516635',
++=======
+                             '10900309' => {
+                                             'Class' => '1791943',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternconverter.h',
 -                                            'MnglName' => '_ZN7log4cxx7pattern16PatternConverterD2Ev',
 +                                            'InLine' => 1,
 +                                            'Line' => '81',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviator26ClazzMaxElementAbbreviatorD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518889'
++=======
+                                                                   'type' => '10886863'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'PatternConverter',
 -                                            'Source' => 'patternconverter.cpp',
 -                                            'SourceLine' => '36',
 +                                            'ShortName' => 'ClazzMaxElementAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10562676' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516635',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '81',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviator26ClazzMaxElementAbbreviatorD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518889'
++=======
+                             '10901661' => {
+                                             'Class' => '1791943',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'MnglName' => '_ZN7log4cxx7pattern16PatternConverterC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10886863'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'name1',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'style1',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'PatternConverter',
 -                                            'Source' => 'patternconverter.cpp',
 -                                            'SourceLine' => '30'
 +                                            'ShortName' => 'ClazzMaxElementAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10562817' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516635',
 +                                            'Destructor' => 1,
 +                                            'InLine' => 1,
 +                                            'Line' => '81',
 +                                            'MnglName' => '_ZN7log4cxx7pattern21MaxElementAbbreviator26ClazzMaxElementAbbreviatorD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518889'
++=======
+                             '10904391' => {
+                                             'Class' => '1791943',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'MnglName' => '_ZN7log4cxx7pattern16PatternConverterC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10886863'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'name1',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'style1',
+                                                                   'type' => '205852'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Protected' => 1,
 -                                            'ShortName' => 'PatternConverter',
 -                                            'Source' => 'patternconverter.cpp',
 -                                            'SourceLine' => '30'
 +                                            'ShortName' => 'ClazzMaxElementAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10564140' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517685',
++=======
+                             '10908541' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10886396',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '76',
 -                                            'MnglName' => '_ZN7log4cxx7pattern16PatternConverter21ClazzPatternConverterD0Ev',
 +                                            'Line' => '48',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviator19ClazzNOPAbbreviatorD0Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518917'
++=======
+                                                                   'type' => '10886908'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternConverter',
 +                                            'ShortName' => 'ClazzNOPAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10564141' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517685',
++=======
+                             '10908542' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10886396',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '76',
 -                                            'MnglName' => '_ZN7log4cxx7pattern16PatternConverter21ClazzPatternConverterD1Ev',
 +                                            'Line' => '48',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviator19ClazzNOPAbbreviatorD1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518917'
++=======
+                                                                   'type' => '10886908'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternConverter',
 +                                            'ShortName' => 'ClazzNOPAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10564282' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10517685',
++=======
+                             '10908682' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10886396',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternconverter.h',
                                              'InLine' => 1,
 -                                            'Line' => '76',
 -                                            'MnglName' => '_ZN7log4cxx7pattern16PatternConverter21ClazzPatternConverterD2Ev',
 +                                            'Line' => '48',
 +                                            'MnglName' => '_ZN7log4cxx7pattern14NOPAbbreviator19ClazzNOPAbbreviatorD2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10518917'
++=======
+                                                                   'type' => '10886908'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternConverter',
 +                                            'ShortName' => 'ClazzNOPAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10564428' => {
 +                                            'Class' => '10515759',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviatorD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518540'
++=======
+                             '10908772' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10886396',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'InLine' => 1,
+                                             'Line' => '76',
+                                             'MnglName' => '_ZN7log4cxx7pattern16PatternConverter21ClazzPatternConverterC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10886908'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternConverter'
 +                                            'ShortName' => 'NameAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '34',
 +                                            'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10564429' => {
 +                                            'Class' => '10515759',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviatorD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518540'
++=======
+                             '10908773' => {
+                                             'Artificial' => 1,
+                                             'Class' => '10886396',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternconverter.h',
+                                             'InLine' => 1,
+                                             'Line' => '76',
+                                             'MnglName' => '_ZN7log4cxx7pattern16PatternConverter21ClazzPatternConverterC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '10886908'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternConverter'
 +                                            'ShortName' => 'NameAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '34',
 +                                            'Virt' => 1
 +                                          },
++<<<<<<< HEAD
 +                            '10564522' => {
 +                                            'Class' => '10515759',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviatorD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518540'
 +                                                                }
 +                                                       },
 +                                            'Reg' => {
 +                                                       '0' => 'rdi'
 +                                                     },
 +                                            'ShortName' => 'NameAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '34',
 +                                            'Virt' => 1
 +                                          },
 +                            '10564637' => {
 +                                            'Class' => '10515759',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviatorC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518540'
 +                                                                }
 +                                                       },
 +                                            'Protected' => 1,
 +                                            'Reg' => {
 +                                                       '0' => 'rdi'
 +                                                     },
 +                                            'ShortName' => 'NameAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '30'
                                            },
 +                            '10564638' => {
 +                                            'Class' => '10515759',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviatorC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518540'
++=======
+                             '11013167' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '93',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser16extractConverterEcRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEmRS7_SA_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'lastChar',
+                                                                   'type' => '334450'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'i',
+                                                                   'type' => '278'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'convBuf',
+                                                                   'type' => '336206'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'currentLiteral',
+                                                                   'type' => '336206'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '41030',
+                                             'ShortName' => 'extractConverter',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '58',
+                                             'Static' => 1
+                                           },
+                             '11013213' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '105',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser14extractOptionsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEmRSt6vectorIS7_SaIS7_EE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'i',
+                                                                   'type' => '278'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'options',
+                                                                   'type' => '1792973'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '41030',
+                                             'ShortName' => 'extractOptions',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '95',
+                                             'Static' => 1
+                                           },
+                             '11013249' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '116',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser5parseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERSt6vectorISt10shared_ptrINS0_16PatternConverterEESaISD_EERSA_ISB_INS0_14FormattingInfoEESaISI_EERKSt3mapIS7_PFSD_RKSA_IS7_SaIS7_EEESt4lessIS7_ESaISt4pairIS8_SS_EEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'patternConverters',
+                                                                   'type' => '11015288'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'formattingInfos',
+                                                                   'type' => '11015294'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'rules',
+                                                                   'type' => '11015300'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'Return' => '1',
 -                                            'ShortName' => 'parse',
 -                                            'Source' => 'patternparser.cpp',
 -                                            'SourceLine' => '115',
 -                                            'Static' => 1
 +                                            'Protected' => 1,
 +                                            'Reg' => {
 +                                                       '0' => 'rdi'
 +                                                     },
 +                                            'ShortName' => 'NameAbbreviator',
 +                                            'Source' => 'nameabbreviator.cpp',
 +                                            'SourceLine' => '30'
 +                                          },
++<<<<<<< HEAD
 +                            '10566265' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516131',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator20ClazzNameAbbreviatorD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518962'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNameAbbreviator',
 +                                            'Virt' => 1
 +                                          },
 +                            '10566266' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516131',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator20ClazzNameAbbreviatorD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518962'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNameAbbreviator',
 +                                            'Virt' => 1
 +                                          },
 +                            '10566407' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516131',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator20ClazzNameAbbreviatorD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518962'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNameAbbreviator',
 +                                            'Virt' => 1
                                            },
 +                            '10566497' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516131',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator20ClazzNameAbbreviatorC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518962'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNameAbbreviator'
 +                                          },
 +                            '10566498' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10516131',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'nameabbreviator.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern15NameAbbreviator20ClazzNameAbbreviatorC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10518962'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNameAbbreviator'
 +                                          },
 +                            '10634267' => {
 +                                            'Class' => '1957574',
++=======
+                             '11013288' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '134',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser15createConverterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERS7_RKSt3mapIS7_PFSt10shared_ptrINS0_16PatternConverterEERKSt6vectorIS7_SaIS7_EEESt4lessIS7_ESaISt4pairIS8_SL_EEERSH_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'converterId',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'currentLiteral',
+                                                                   'type' => '336206'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'rules',
+                                                                   'type' => '11015300'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'options',
+                                                                   'type' => '1792973'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '1792237',
+                                             'ShortName' => 'createConverter',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '312',
+                                             'Static' => 1
+                                           },
+                             '11013329' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '153',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser17finalizeConverterEcRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEmRS7_RKSt10shared_ptrINS0_14FormattingInfoEERKSt3mapIS7_PFSB_INS0_16PatternConverterEERKSt6vectorIS7_SaIS7_EEESt4lessIS7_ESaISt4pairIS8_SP_EEERSJ_ISI_SaISI_EERSJ_ISD_SaISD_EE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'c',
+                                                                   'type' => '334450'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'i',
+                                                                   'type' => '41030'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'currentLiteral',
+                                                                   'type' => '336206'
+                                                                 },
+                                                          '4' => {
+                                                                   'name' => 'formattingInfo',
+                                                                   'type' => '11015306'
+                                                                 },
+                                                          '5' => {
+                                                                   'name' => 'rules',
+                                                                   'type' => '11015300'
+                                                                 },
+                                                          '6' => {
+                                                                   'name' => 'patternConverters',
+                                                                   'offset' => '0',
+                                                                   'type' => '11015288'
+                                                                 },
+                                                          '7' => {
+                                                                   'name' => 'formattingInfos',
+                                                                   'offset' => '8',
+                                                                   'type' => '11015294'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '41030',
+                                             'ShortName' => 'finalizeConverter',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '339',
+                                             'Static' => 1
+                                           },
+                             '11013390' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '160',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser24isUnicodeIdentifierStartEc',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'ch',
+                                                                   'type' => '334450'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '40888',
+                                             'ShortName' => 'isUnicodeIdentifierStart',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '37',
+                                             'Static' => 1
+                                           },
+                             '11013416' => {
+                                             'Class' => '11013116',
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '161',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser23isUnicodeIdentifierPartEc',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'ch',
+                                                                   'type' => '334450'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Return' => '40888',
+                                             'ShortName' => 'isUnicodeIdentifierPart',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '48',
+                                             'Static' => 1
+                                           },
+                             '11013694' => {
+                                             'Data' => 1,
+                                             'Line' => '60',
+                                             'MnglName' => '_ZN7log4cxx7classes25PatternLayoutRegistrationE',
+                                             'NameSpace' => 'log4cxx::classes',
+                                             'Return' => '53989',
+                                             'ShortName' => 'PatternLayoutRegistration',
+                                             'Source' => 'patternlayout.cpp'
+                                           },
+                             '11013858' => {
+                                             'Class' => '911163',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'patternlayout.h',
 -                                            'MnglName' => '_ZNK7log4cxx13PatternLayout8getClassEv',
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern20NamePatternConverter8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '1979133'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'namepatternconverter.cpp',
 +                                            'SourceLine' => '46',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '0'
 +                                          },
 +                            '10634324' => {
 +                                            'Class' => '1957574',
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'namepatternconverter.cpp',
 +                                            'SourceLine' => '46',
 +                                            'Static' => 1
 +                                          },
 +                            '10634519' => {
 +                                            'Class' => '1957574',
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter14getAbbreviatorERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS8_EE',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
 +                                                                  'type' => '1977241'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'options',
 +                                                                  'type' => '1958846'
 +                                                                }
 +                                                       },
 +                                            'Private' => 1,
 +                                            'Return' => '10517883',
 +                                            'ShortName' => 'getAbbreviator',
 +                                            'Source' => 'namepatternconverter.cpp',
 +                                            'SourceLine' => '57'
 +                                          },
 +                            '10634675' => {
 +                                            'Class' => '10634554',
++=======
+                                                                   'type' => '11017971'
+                                                                 }
+                                                        },
+                                             'Return' => '53983',
+                                             'ShortName' => 'getClass',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '60',
+                                             'Virt' => 1,
+                                             'VirtPos' => '0'
+                                           },
+                             '11013916' => {
+                                             'Class' => '911163',
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout13registerClassEv',
+                                             'Return' => '53989',
+                                             'ShortName' => 'registerClass',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '60',
+                                             'Static' => 1
+                                           },
+                             '11013934' => {
+                                             'Class' => '911163',
+                                             'Const' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'InLine' => 2,
+                                             'Line' => '382',
+                                             'MnglName' => '_ZNK7log4cxx13PatternLayout4castERKNS_7helpers5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017971'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '44634',
+                                             'ShortName' => 'cast',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '11013980' => {
+                                             'Class' => '911163',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'namepatternconverter.h',
                                              'InLine' => 2,
++<<<<<<< HEAD
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern20NamePatternConverter25ClazzNamePatternConverter7getNameB5cxx11Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10636238'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10634910' => {
 +                                            'Data' => 1,
 +                                            'Line' => '46',
 +                                            'MnglName' => '_ZN7log4cxx7classes32NamePatternConverterRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'NamePatternConverterRegistration',
 +                                            'Source' => 'namepatternconverter.cpp'
 +                                          },
 +                            '10649129' => {
 +                                            'Class' => '1957574',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverterC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_RKSt6vectorIS7_SaIS7_EE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '1977241'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'name1',
 +                                                                  'type' => '241824'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'style1',
 +                                                                  'type' => '241824'
 +                                                                },
 +                                                         '3' => {
 +                                                                  'name' => 'options',
 +                                                                  'type' => '1958846'
 +                                                                }
 +                                                       },
 +                                            'Protected' => 1,
 +                                            'ShortName' => 'NamePatternConverter',
 +                                            'Source' => 'namepatternconverter.cpp',
 +                                            'SourceLine' => '48'
 +                                          },
 +                            '10660104' => {
 +                                            'Class' => '1957574',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverterC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_RKSt6vectorIS7_SaIS7_EE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '1977241'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'name1',
 +                                                                  'type' => '241824'
 +                                                                },
 +                                                         '3' => {
 +                                                                  'name' => 'style1',
 +                                                                  'type' => '241824'
 +                                                                },
 +                                                         '4' => {
 +                                                                  'name' => 'options',
 +                                                                  'type' => '1958846'
 +                                                                }
 +                                                       },
 +                                            'Protected' => 1,
 +                                            'ShortName' => 'NamePatternConverter',
 +                                            'Source' => 'namepatternconverter.cpp',
 +                                            'SourceLine' => '48'
 +                                          },
 +                            '10672974' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10634554',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter25ClazzNamePatternConverterD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10636221'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNamePatternConverter',
 +                                            'Virt' => 1
 +                                          },
 +                            '10672975' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10634554',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter25ClazzNamePatternConverterD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10636221'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNamePatternConverter',
 +                                            'Virt' => 1
 +                                          },
 +                            '10673116' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10634554',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter25ClazzNamePatternConverterD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10636221'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNamePatternConverter',
 +                                            'Virt' => 1
 +                                          },
 +                            '10673206' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10634554',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter25ClazzNamePatternConverterC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10636221'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNamePatternConverter'
 +                                          },
 +                            '10673207' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10634554',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'namepatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '41',
 +                                            'MnglName' => '_ZN7log4cxx7pattern20NamePatternConverter25ClazzNamePatternConverterC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10636221'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzNamePatternConverter'
 +                                          },
 +                            '10783519' => {
 +                                            'Class' => '595826',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'ndc.h',
 +                                            'Line' => '251',
 +                                            'MnglName' => '_ZN7log4cxx3NDCC2ERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10750113'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'message',
 +                                                                  'type' => '594235'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDC',
 +                                            'Source' => 'ndc.cpp',
 +                                            'SourceLine' => '252'
 +                                          },
 +                            '10783520' => {
 +                                            'Class' => '595826',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'ndc.h',
 +                                            'Line' => '251',
 +                                            'MnglName' => '_ZN7log4cxx3NDCC1ERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10750113'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'message',
 +                                                                  'type' => '594235'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDC',
 +                                            'Source' => 'ndc.cpp',
 +                                            'SourceLine' => '252'
 +                                          },
 +                            '10802268' => {
 +                                            'Class' => '595826',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'ndc.h',
 +                                            'Line' => '123',
 +                                            'MnglName' => '_ZN7log4cxx3NDCD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10750113'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDC',
 +                                            'Source' => 'ndc.cpp',
 +                                            'SourceLine' => '35'
 +                                          },
 +                            '10803001' => {
 +                                            'Class' => '595826',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'ndc.h',
 +                                            'Line' => '116',
 +                                            'MnglName' => '_ZN7log4cxx3NDCC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10750113'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'message',
 +                                                                  'type' => '55459'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDC',
 +                                            'Source' => 'ndc.cpp',
 +                                            'SourceLine' => '30'
 +                                          },
 +                            '10803002' => {
 +                                            'Class' => '595826',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'ndc.h',
 +                                            'Line' => '116',
 +                                            'MnglName' => '_ZN7log4cxx3NDCC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10750113'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'message',
 +                                                                  'type' => '55459'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDC',
 +                                            'Source' => 'ndc.cpp',
 +                                            'SourceLine' => '30'
 +                                          },
 +                            '10859927' => {
 +                                            'Class' => '10859770',
 +                                            'Const' => 1,
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern19NDCPatternConverter8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861390'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '34',
++=======
+                                             'Line' => '385',
+                                             'MnglName' => '_ZNK7log4cxx13PatternLayout10instanceofERKNS_7helpers5ClassE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017971'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'clazz',
+                                                                   'type' => '53983'
+                                                                 }
+                                                        },
+                                             'Return' => '40888',
+                                             'ShortName' => 'instanceof',
+                                             'Virt' => 1,
+                                             'VirtPos' => '3'
+                                           },
+                             '11014169' => {
+                                             'Class' => '911163',
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout15activateOptionsERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'p1',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '1' => 'rsi'
+                                                      },
+                                             'Return' => '1',
+                                             'ShortName' => 'activateOptions',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '113',
+                                             'Virt' => 1,
+                                             'VirtPos' => '5'
+                                           },
+                             '11014209' => {
+                                             'Class' => '911163',
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout9setOptionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'option',
+                                                                   'type' => '205852'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'value',
+                                                                   'type' => '205852'
+                                                                 }
+                                                        },
+                                             'Return' => '1',
+                                             'ShortName' => 'setOption',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '103',
+                                             'Virt' => 1,
+                                             'VirtPos' => '6'
+                                           },
+                             '11014254' => {
+                                             'Class' => '911163',
+                                             'Const' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'InLine' => 2,
+                                             'Line' => '424',
+                                             'MnglName' => '_ZNK7log4cxx13PatternLayout16ignoresThrowableEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017971'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'Return' => '40888',
+                                             'ShortName' => 'ignoresThrowable',
+                                             'Virt' => 1,
+                                             'VirtPos' => '11'
+                                           },
+                             '11014295' => {
+                                             'Class' => '911163',
+                                             'Const' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZNK7log4cxx13PatternLayout6formatERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt10shared_ptrINS_3spi12LoggingEventEERNS_7helpers4PoolE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017971'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'output',
+                                                                   'type' => '336206'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'event',
+                                                                   'type' => '117970'
+                                                                 },
+                                                          '3' => {
+                                                                   'name' => 'pool',
+                                                                   'type' => '53948'
+                                                                 }
+                                                        },
+                                             'Return' => '1',
+                                             'ShortName' => 'format',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '84',
+                                             'Virt' => 1,
+                                             'VirtPos' => '7'
+                                           },
+                             '11014345' => {
+                                             'Class' => '911163',
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout19getFormatSpecifiersB5cxx11Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
+                                                                 }
+                                                        },
+                                             'Protected' => 1,
+                                             'Return' => '5414950',
+                                             'ShortName' => 'getFormatSpecifiers',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '152',
+                                             'Virt' => 1,
+                                             'VirtPos' => '12'
+                                           },
+                             '11014509' => {
+                                             'Class' => '11014385',
+                                             'Const' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'InLine' => 2,
+                                             'Line' => '381',
+                                             'MnglName' => '_ZNK7log4cxx13PatternLayout18ClazzPatternLayout7getNameB5cxx11Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017999'
+                                                                 }
+                                                        },
+                                             'Return' => '53185',
+                                             'ShortName' => 'getName',
++>>>>>>> master
                                              'Virt' => 1,
 -                                            'VirtPos' => '3'
 +                                            'VirtPos' => '0'
 +                                          },
++<<<<<<< HEAD
 +                            '10859966' => {
 +                                            'Class' => '10859770',
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '34',
 +                                            'Static' => 1
 +                                          },
 +                            '10859984' => {
 +                                            'Class' => '10859770',
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '34',
 +                                            'Static' => 1
                                            },
 +                            '10860002' => {
 +                                            'Class' => '10859770',
++=======
+                             '11014550' => {
+                                             'Class' => '11014385',
++>>>>>>> master
                                              'Const' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'InLine' => 2,
++<<<<<<< HEAD
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern19NDCPatternConverter4castERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861390'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '4'
 +                                          },
 +                            '10860046' => {
 +                                            'Class' => '10859770',
 +                                            'Const' => 1,
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 2,
 +                                            'Line' => '48',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern19NDCPatternConverter10instanceofERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861390'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10860090' => {
 +                                            'Class' => '10859770',
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter11newInstanceERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS8_EE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'p1',
 +                                                                  'type' => '389696'
 +                                                                }
 +                                                       },
 +                                            'Reg' => {
 +                                                       '0' => 'rsi'
 +                                                     },
 +                                            'Return' => '1957741',
 +                                            'ShortName' => 'newInstance',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '42',
 +                                            'Static' => 1
 +                                          },
 +                            '10860118' => {
 +                                            'Class' => '10859770',
 +                                            'Const' => 1,
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern19NDCPatternConverter6formatERKSt10shared_ptrINS_3spi12LoggingEventEERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_7helpers4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861390'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'event',
 +                                                                  'type' => '137116'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'toAppendTo',
 +                                                                  'type' => '388758'
 +                                                                },
 +                                                         '3' => {
 +                                                                  'name' => 'p3',
 +                                                                  'type' => '57881'
++=======
+                                             'Line' => '381',
+                                             'MnglName' => '_ZNK7log4cxx13PatternLayout18ClazzPatternLayout11newInstanceEv',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017999'
+                                                                 }
+                                                        },
+                                             'Return' => '913024',
+                                             'ShortName' => 'newInstance',
+                                             'Virt' => 1,
+                                             'VirtPos' => '4'
+                                           },
+                             '11014811' => {
+                                             'Header' => 'object.h',
+                                             'InLine' => 2,
+                                             'Line' => '122',
+                                             'MnglName' => '_ZN7log4cxx4castINS_7pattern28LoggingEventPatternConverterENS1_16PatternConverterELb0ELb0EEESt10shared_ptrIT_ERKS4_IT0_E',
+                                             'NameSpace' => 'log4cxx',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'incoming',
+                                                                   'type' => '1792805'
+                                                                 }
+                                                        },
+                                             'Return' => '10960572',
+                                             'ShortName' => 'cast<log4cxx::pattern::LoggingEventPatternConverter, log4cxx::pattern::PatternConverter>',
+                                             'TParam' => {
+                                                           '0' => {
+                                                                    'key' => 'Ret',
+                                                                    'type' => '1791688'
+                                                                  },
+                                                           '1' => {
+                                                                    'key' => 'Type',
+                                                                    'type' => '1791943'
+                                                                  }
+                                                         }
+                                           },
+                             '11018449' => {
+                                             'Artificial' => 1,
+                                             'Class' => '911163',
+                                             'Destructor' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'InLine' => 1,
+                                             'Line' => '363',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayoutD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'PatternLayout',
 -                                            'Virt' => 1
 +                                            'Reg' => {
 +                                                       '3' => 'rcx'
 +                                                     },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'format',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '49',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '7'
                                            },
++<<<<<<< HEAD
 +                            '10860289' => {
 +                                            'Class' => '10860168',
 +                                            'Const' => 1,
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZNK7log4cxx7pattern19NDCPatternConverter24ClazzNDCPatternConverter7getNameB5cxx11Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861424'
++=======
+                             '11018450' => {
+                                             'Artificial' => 1,
+                                             'Class' => '911163',
+                                             'Destructor' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'InLine' => 1,
+                                             'Line' => '363',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayoutD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'PatternLayout',
 -                                            'Virt' => 1
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10860703' => {
 +                                            'Data' => 1,
 +                                            'Line' => '34',
 +                                            'MnglName' => '_ZN7log4cxx7classes31NDCPatternConverterRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'NDCPatternConverterRegistration',
 +                                            'Source' => 'ndcpatternconverter.cpp'
                                            },
++<<<<<<< HEAD
 +                            '10863265' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10859770',
++=======
+                             '11021941' => {
+                                             'Artificial' => 1,
+                                             'Class' => '911163',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 1,
++<<<<<<< HEAD
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverterD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861149'
++=======
+                                             'Line' => '363',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayoutD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'PatternLayout',
 +                                            'ShortName' => 'NDCPatternConverter',
 +                                            'Virt' => 1
 +                                          },
++<<<<<<< HEAD
 +                            '10863266' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10859770',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverterD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861149'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDCPatternConverter',
 +                                            'Virt' => 1
 +                                          },
 +                            '10863530' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10859770',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '35',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverterD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861149'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'NDCPatternConverter',
                                              'Virt' => 1
                                            },
 +                            '10872099' => {
 +                                            'Class' => '10859770',
++=======
+                             '11242161' => {
+                                             'Class' => '911163',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayoutC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
+                                                                 },
+                                                          '1' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'PatternLayout',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '70'
+                                           },
+                             '11244741' => {
+                                             'Class' => '911163',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternlayout.h',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayoutC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017937'
+                                                                 },
+                                                          '2' => {
+                                                                   'name' => 'pattern',
+                                                                   'type' => '205852'
+                                                                 }
+                                                        },
+                                             'ShortName' => 'PatternLayout',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '70'
+                                           },
+                             '11247253' => {
+                                             'Class' => '911163',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 -                                            'MnglName' => '_ZN7log4cxx13PatternLayoutC1Ev',
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverterC1Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10861149'
 +                                                                }
 +                                                       },
 +                                            'Private' => 1,
 +                                            'ShortName' => 'NDCPatternConverter',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '36'
 +                                          },
 +                            '10876240' => {
 +                                            'Class' => '10859770',
++=======
+                                                                   'type' => '11017937'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'ShortName' => 'PatternLayout',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '63'
+                                           },
+                             '11248641' => {
+                                             'Class' => '911163',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 -                                            'MnglName' => '_ZN7log4cxx13PatternLayoutC2Ev',
 +                                            'Header' => 'ndcpatternconverter.h',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverterC2Ev',
                                              'Param' => {
                                                           '0' => {
                                                                    'name' => 'this',
++<<<<<<< HEAD
 +                                                                  'type' => '10861149'
 +                                                                }
 +                                                       },
 +                                            'Private' => 1,
 +                                            'ShortName' => 'NDCPatternConverter',
 +                                            'Source' => 'ndcpatternconverter.cpp',
 +                                            'SourceLine' => '36'
 +                                          },
 +                            '10881890' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10860168',
++=======
+                                                                   'type' => '11017937'
+                                                                 }
+                                                        },
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'ShortName' => 'PatternLayout',
+                                             'Source' => 'patternlayout.cpp',
+                                             'SourceLine' => '63'
+                                           },
+                             '11251631' => {
+                                             'Artificial' => 1,
+                                             'Class' => '11014385',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 1,
++<<<<<<< HEAD
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter24ClazzNDCPatternConverterD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861407'
++=======
+                                             'Line' => '381',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout18ClazzPatternLayoutD0Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017982'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternLayout',
 +                                            'ShortName' => 'ClazzNDCPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10881891' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10860168',
++=======
+                             '11251632' => {
+                                             'Artificial' => 1,
+                                             'Class' => '11014385',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 1,
++<<<<<<< HEAD
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter24ClazzNDCPatternConverterD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861407'
++=======
+                                             'Line' => '381',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout18ClazzPatternLayoutD1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017982'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternLayout',
 +                                            'ShortName' => 'ClazzNDCPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10882031' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10860168',
++=======
+                             '11251774' => {
+                                             'Artificial' => 1,
+                                             'Class' => '11014385',
++>>>>>>> master
                                              'Destructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 1,
++<<<<<<< HEAD
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter24ClazzNDCPatternConverterD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861407'
++=======
+                                             'Line' => '381',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout18ClazzPatternLayoutD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017982'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternLayout',
 +                                            'ShortName' => 'ClazzNDCPatternConverter',
                                              'Virt' => 1
                                            },
++<<<<<<< HEAD
 +                            '10882121' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10860168',
++=======
+                             '11251864' => {
+                                             'Artificial' => 1,
+                                             'Class' => '11014385',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 1,
++<<<<<<< HEAD
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter24ClazzNDCPatternConverterC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861407'
++=======
+                                             'Line' => '381',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout18ClazzPatternLayoutC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017982'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternLayout'
 +                                            'ShortName' => 'ClazzNDCPatternConverter'
                                            },
++<<<<<<< HEAD
 +                            '10882122' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10860168',
++=======
+                             '11251865' => {
+                                             'Artificial' => 1,
+                                             'Class' => '11014385',
++>>>>>>> master
                                              'Constructor' => 1,
 -                                            'Header' => 'patternlayout.h',
 +                                            'Header' => 'ndcpatternconverter.h',
                                              'InLine' => 1,
++<<<<<<< HEAD
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7pattern19NDCPatternConverter24ClazzNDCPatternConverterC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10861407'
++=======
+                                             'Line' => '381',
+                                             'MnglName' => '_ZN7log4cxx13PatternLayout18ClazzPatternLayoutC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11017982'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'ClazzPatternLayout'
 +                                            'ShortName' => 'ClazzNDCPatternConverter'
 +                                          },
 +                            '10977819' => {
 +                                            'Class' => '734375',
 +                                            'Const' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981661'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '30',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '0'
 +                                          },
 +                            '10977859' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '30',
 +                                            'Static' => 1
 +                                          },
 +                            '10977877' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '30',
 +                                            'Static' => 1
 +                                          },
 +                            '10977895' => {
 +                                            'Class' => '734375',
 +                                            'Const' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '37',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream4castERKNS0_5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981661'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '4'
 +                                          },
 +                            '10977940' => {
 +                                            'Class' => '734375',
 +                                            'Const' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '39',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream10instanceofERKNS0_5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981661'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
 +                                                                }
 +                                                       },
 +                                            'Return' => '44689',
 +                                            'ShortName' => 'instanceof',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10978060' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'Line' => '44',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream5closeERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'close',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '49'
 +                                          },
 +                            '10978092' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'Line' => '45',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream5flushERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'flush',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '54'
 +                                          },
 +                            '10978124' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream5resetERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'reset',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '59'
 +                                          },
 +                            '10978156' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream11writeObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '241824'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'writeObject',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '69'
 +                                          },
 +                            '10978230' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream11writeObjectERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_St4lessIS8_ESaISt4pairIKS8_S8_EEERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '10981677'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'writeObject',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '94'
 +                                          },
 +                            '10978267' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream8writeIntEiRNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '44636'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'writeInt',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '163'
 +                                          },
 +                            '10978304' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream9writeLongExRNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '594289'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'writeLong',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '176'
 +                                          },
 +                            '10978425' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream9writeByteEcRNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'val',
 +                                                                  'type' => '45016'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'writeByte',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '157'
 +                                          },
 +                            '10978462' => {
 +                                            'Class' => '734375',
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream10writeBytesEPKcmRNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'bytes',
 +                                                                  'type' => '45472'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'len',
 +                                                                  'type' => '44831'
 +                                                                },
 +                                                         '3' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'Return' => '1',
 +                                            'ShortName' => 'writeBytes',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '193'
 +                                          },
 +                            '10978768' => {
 +                                            'Class' => '10978647',
 +                                            'Const' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '36',
 +                                            'MnglName' => '_ZNK7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStream7getNameB5cxx11Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981724'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57000',
 +                                            'ShortName' => 'getName',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '3'
 +                                          },
 +                            '10979486' => {
 +                                            'Data' => 1,
 +                                            'Line' => '30',
 +                                            'MnglName' => '_ZN7log4cxx7classes30ObjectOutputStreamRegistrationE',
 +                                            'NameSpace' => 'log4cxx::classes',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'ObjectOutputStreamRegistration',
 +                                            'Source' => 'objectoutputstream.cpp'
 +                                          },
 +                            '11011133' => {
 +                                            'Class' => '734375',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ObjectOutputStream',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '44',
 +                                            'Virt' => 1
 +                                          },
 +                            '11011134' => {
 +                                            'Class' => '734375',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ObjectOutputStream',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '44',
 +                                            'Virt' => 1
 +                                          },
 +                            '11011229' => {
 +                                            'Class' => '734375',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ObjectOutputStream',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '44',
 +                                            'Virt' => 1
 +                                          },
 +                            '11013144' => {
 +                                            'Class' => '734375',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamC2ESt10shared_ptrINS0_12OutputStreamEERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'outputStream',
 +                                                                  'type' => '4756417'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ObjectOutputStream',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '32'
 +                                          },
 +                            '11013145' => {
 +                                            'Class' => '734375',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStreamC1ESt10shared_ptrINS0_12OutputStreamEERNS0_4PoolE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981672'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'outputStream',
 +                                                                  'type' => '4756417'
 +                                                                },
 +                                                         '2' => {
 +                                                                  'name' => 'p',
 +                                                                  'type' => '57881'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ObjectOutputStream',
 +                                            'Source' => 'objectoutputstream.cpp',
 +                                            'SourceLine' => '32'
 +                                          },
 +                            '11016821' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10978647',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '36',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamD0Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981707'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzObjectOutputStream',
 +                                            'Virt' => 1
 +                                          },
 +                            '11016822' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10978647',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '36',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamD1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981707'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzObjectOutputStream',
 +                                            'Virt' => 1
 +                                          },
++<<<<<<< HEAD
 +                            '11016963' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10978647',
 +                                            'Destructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '36',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamD2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981707'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzObjectOutputStream',
 +                                            'Virt' => 1
 +                                          },
 +                            '11017054' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10978647',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '36',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamC2Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981707'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzObjectOutputStream'
 +                                          },
 +                            '11017055' => {
 +                                            'Artificial' => 1,
 +                                            'Class' => '10978647',
 +                                            'Constructor' => 1,
 +                                            'Header' => 'objectoutputstream.h',
 +                                            'InLine' => 1,
 +                                            'Line' => '36',
 +                                            'MnglName' => '_ZN7log4cxx7helpers18ObjectOutputStream23ClazzObjectOutputStreamC1Ev',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '10981707'
 +                                                                }
 +                                                       },
 +                                            'ShortName' => 'ClazzObjectOutputStream'
                                            },
 +                            '1110149' => {
 +                                           'Class' => '1109998',
++=======
+                             '1133320' => {
+                                            'Class' => '1133282',
++>>>>>>> master
                                             'Const' => 1,
 -                                           'Header' => 'bytearrayoutputstream.h',
 -                                           'MnglName' => '_ZNK7log4cxx7helpers21ByteArrayOutputStream8getClassEv',
 +                                           'Header' => 'bufferedwriter.h',
 +                                           'MnglName' => '_ZNK7log4cxx7helpers14BufferedWriter8getClassEv',
                                             'Param' => {
                                                          '0' => {
                                                                   'name' => 'this',
++<<<<<<< HEAD
 +                                                                 'type' => '1111579'
 +                                                               }
 +                                                      },
 +                                           'Return' => '57916',
++=======
+                                                                  'type' => '1134586'
+                                                                }
+                                                       },
+                                            'Return' => '53983',
++>>>>>>> master
                                             'ShortName' => 'getClass',
 -                                           'Source' => 'bytearrayoutputstream.cpp',
 -                                           'SourceLine' => '27',
 +                                           'Source' => 'bufferedwriter.cpp',
 +                                           'SourceLine' => '36',
                                             'Virt' => 1,
                                             'VirtPos' => '0'
                                           },
++<<<<<<< HEAD
 +                            '1110188' => {
 +                                           'Class' => '1109998',
 +                                           'Header' => 'bufferedwriter.h',
 +                                           'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter14getStaticClassEv',
 +                                           'Return' => '57916',
++=======
+                             '1133359' => {
+                                            'Class' => '1133282',
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream14getStaticClassEv',
+                                            'Return' => '53983',
++>>>>>>> master
                                             'ShortName' => 'getStaticClass',
 -                                           'Source' => 'bytearrayoutputstream.cpp',
 -                                           'SourceLine' => '27',
 +                                           'Source' => 'bufferedwriter.cpp',
 +                                           'SourceLine' => '36',
                                             'Static' => 1
                                           },
++<<<<<<< HEAD
 +                            '1110206' => {
 +                                           'Class' => '1109998',
 +                                           'Header' => 'bufferedwriter.h',
 +                                           'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter13registerClassEv',
 +                                           'Return' => '57922',
++=======
+                             '1133377' => {
+                                            'Class' => '1133282',
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream13registerClassEv',
+                                            'Return' => '53989',
++>>>>>>> master
                                             'ShortName' => 'registerClass',
 -                                           'Source' => 'bytearrayoutputstream.cpp',
 -                                           'SourceLine' => '27',
 +                                           'Source' => 'bufferedwriter.cpp',
 +                                           'SourceLine' => '36',
                                             'Static' => 1
                                           },
++<<<<<<< HEAD
 +                            '1110224' => {
 +                                           'Class' => '1109998',
++=======
+                             '1133395' => {
+                                            'Class' => '1133282',
++>>>>>>> master
                                             'Const' => 1,
 -                                           'Header' => 'bytearrayoutputstream.h',
 +                                           'Header' => 'bufferedwriter.h',
                                             'InLine' => 2,
 -                                           'Line' => '51',
 -                                           'MnglName' => '_ZNK7log4cxx7helpers21ByteArrayOutputStream4castERKNS0_5ClassE',
 +                                           'Line' => '46',
 +                                           'MnglName' => '_ZNK7log4cxx7helpers14BufferedWriter4castERKNS0_5ClassE',
                                             'Param' => {
                                                          '0' => {
                                                                   'name' => 'this',
++<<<<<<< HEAD
 +                                                                 'type' => '1111579'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'clazz',
 +                                                                 'type' => '57916'
 +                                                               }
 +                                                      },
 +                                           'Return' => '48436',
++=======
+                                                                  'type' => '1134586'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'clazz',
+                                                                  'type' => '53983'
+                                                                }
+                                                       },
+                                            'Return' => '44634',
++>>>>>>> master
                                             'ShortName' => 'cast',
                                             'Virt' => 1,
                                             'VirtPos' => '4'
                                           },
++<<<<<<< HEAD
 +                            '1110268' => {
 +                                           'Class' => '1109998',
++=======
+                             '1133439' => {
+                                            'Class' => '1133282',
++>>>>>>> master
                                             'Const' => 1,
 -                                           'Header' => 'bytearrayoutputstream.h',
 +                                           'Header' => 'bufferedwriter.h',
                                             'InLine' => 2,
 -                                           'Line' => '54',
 -                                           'MnglName' => '_ZNK7log4cxx7helpers21ByteArrayOutputStream10instanceofERKNS0_5ClassE',
 +                                           'Line' => '49',
 +                                           'MnglName' => '_ZNK7log4cxx7helpers14BufferedWriter10instanceofERKNS0_5ClassE',
                                             'Param' => {
                                                          '0' => {
                                                                   'name' => 'this',
++<<<<<<< HEAD
 +                                                                 'type' => '1111579'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'clazz',
 +                                                                 'type' => '57916'
 +                                                               }
 +                                                      },
 +                                           'Return' => '44689',
++=======
+                                                                  'type' => '1134586'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'clazz',
+                                                                  'type' => '53983'
+                                                                }
+                                                       },
+                                            'Return' => '40888',
++>>>>>>> master
                                             'ShortName' => 'instanceof',
                                             'Virt' => 1,
                                             'VirtPos' => '3'
                                           },
++<<<<<<< HEAD
 +                            '1110419' => {
 +                                           'Class' => '1109998',
 +                                           'Header' => 'bufferedwriter.h',
 +                                           'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter5closeERNS0_4PoolE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'this',
 +                                                                 'type' => '1111590'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'p',
 +                                                                 'type' => '57881'
++=======
+                             '1133548' => {
+                                            'Class' => '1133282',
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream5closeERNS0_4PoolE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'p1',
+                                                                  'type' => '53948'
++>>>>>>> master
                                                                 }
                                                        },
 -                                           'Reg' => {
 -                                                      '0' => 'rdi',
 -                                                      '1' => 'rsi'
 -                                                    },
                                             'Return' => '1',
                                             'ShortName' => 'close',
 -                                           'Source' => 'bytearrayoutputstream.cpp',
 -                                           'SourceLine' => '37',
 +                                           'Source' => 'bufferedwriter.cpp',
 +                                           'SourceLine' => '52',
                                             'Virt' => 1,
                                             'VirtPos' => '5'
                                           },
++<<<<<<< HEAD
 +                            '1110459' => {
 +                                           'Class' => '1109998',
 +                                           'Header' => 'bufferedwriter.h',
 +                                           'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter5flushERNS0_4PoolE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'this',
 +                                                                 'type' => '1111590'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'p',
 +                                                                 'type' => '57881'
++=======
+                             '1133589' => {
+                                            'Class' => '1133282',
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream5flushERNS0_4PoolE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'p1',
+                                                                  'type' => '53948'
++>>>>>>> master
                                                                 }
                                                        },
 -                                           'Reg' => {
 -                                                      '0' => 'rdi',
 -                                                      '1' => 'rsi'
 -                                                    },
                                             'Return' => '1',
                                             'ShortName' => 'flush',
 -                                           'Source' => 'bytearrayoutputstream.cpp',
 -                                           'SourceLine' => '41',
 +                                           'Source' => 'bufferedwriter.cpp',
 +                                           'SourceLine' => '58',
                                             'Virt' => 1,
                                             'VirtPos' => '6'
                                           },
 -                            '1133630' => {
 -                                           'Class' => '1133282',
++<<<<<<< HEAD
 +                            '1110499' => {
 +                                           'Class' => '1109998',
 +                                           'Header' => 'bufferedwriter.h',
 +                                           'MnglName' => '_ZN7log4cxx7helpers14BufferedWriter5writeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS0_4PoolE',
 +                                           'Param' => {
 +                                                        '0' => {
 +                                                                 'name' => 'this',
 +                                                                 'type' => '1111590'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'str',
 +                                                                 'type' => '241824'
 +                                                               },
 +                                                        '2' => {
 +                                                                 'name' => 'p',
 +                                                                 'type' => '57881'
++=======
++                            '1133630' => {
++                                           'Class' => '1133282',
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream5writeERNS0_10ByteBufferERNS0_4PoolE',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'buf',
+                                                                  'type' => '1062818'
+                                                                },
+                                                         '2' => {
+                                                                  'name' => 'p2',
+                                                                  'type' => '53948'
++>>>>>>> master
                                                                 }
                                                        },
 -                                           'Reg' => {
 -                                                      '2' => 'rdx'
 -                                                    },
                                             'Return' => '1',
                                             'ShortName' => 'write',
 -                                           'Source' => 'bytearrayoutputstream.cpp',
 -                                           'SourceLine' => '45',
 +                                           'Source' => 'bufferedwriter.cpp',
 +                                           'SourceLine' => '67',
                                             'Virt' => 1,
                                             'VirtPos' => '7'
                                           },
++<<<<<<< HEAD
 +                            '1110731' => {
 +                                           'Class' => '1110610',
++=======
+                             '1133676' => {
+                                            'Class' => '1133282',
+                                            'Const' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZNK7log4cxx7helpers21ByteArrayOutputStream11toByteArrayEv',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134586'
+                                                                }
+                                                       },
+                                            'Return' => '1041669',
+                                            'ShortName' => 'toByteArray',
+                                            'Source' => 'bytearrayoutputstream.cpp',
+                                            'SourceLine' => '53'
+                                          },
+                             '1133894' => {
+                                            'Class' => '1133773',
++>>>>>>> master
                                             'Const' => 1,
 -                                           'Header' => 'bytearrayoutputstream.h',
 +                                           'Header' => 'bufferedwriter.h',
                                             'InLine' => 2,
 -                                           'Line' => '50',
 -                                           'MnglName' => '_ZNK7log4cxx7helpers21ByteArrayOutputStream26ClazzByteArrayOutputStream7getNameB5cxx11Ev',
 +                                           'Line' => '45',
 +                                           'MnglName' => '_ZNK7log4cxx7helpers14BufferedWriter19ClazzBufferedWriter7getNameB5cxx11Ev',
                                             'Param' => {
                                                          '0' => {
                                                                   'name' => 'this',
++<<<<<<< HEAD
 +                                                                 'type' => '1111630'
 +                                                               }
 +                                                      },
 +                                           'Return' => '57000',
++=======
+                                                                  'type' => '1134637'
+                                                                }
+                                                       },
+                                            'Return' => '53185',
++>>>>>>> master
                                             'ShortName' => 'getName',
                                             'Virt' => 1,
                                             'VirtPos' => '3'
                                           },
++<<<<<<< HEAD
 +                            '1110789' => {
 +                                           'Class' => '1110779',
++=======
+                             '1133952' => {
+                                            'Class' => '1133942',
++>>>>>>> master
                                             'Const' => 1,
 -                                           'Header' => 'outputstream.h',
 +                                           'Header' => 'writer.h',
                                             'InLine' => 2,
 -                                           'Line' => '40',
 -                                           'MnglName' => '_ZNK7log4cxx7helpers12OutputStream4castERKNS0_5ClassE',
 +                                           'Line' => '37',
 +                                           'MnglName' => '_ZNK7log4cxx7helpers6Writer4castERKNS0_5ClassE',
                                             'Param' => {
                                                          '0' => {
                                                                   'name' => 'this',
++<<<<<<< HEAD
 +                                                                 'type' => '1131266'
 +                                                               },
 +                                                        '1' => {
 +                                                                 'name' => 'clazz',
 +                                                                 'type' => '57916'
 +                                                               }
 +                                                      },
 +                                           'Return' => '48436',
++=======
+                                                                  'type' => '1149927'
+                                                                },
+                                                         '1' => {
+                                                                  'name' => 'clazz',
+                                                                  'type' => '53983'
+                                                                }
+                                                       },
+                                            'Return' => '44634',
++>>>>>>> master
                                             'ShortName' => 'cast',
                                             'Virt' => 1,
                                             'VirtPos' => '4'
                                           },
++<<<<<<< HEAD
 +                            '1110833' => {
 +                                           'Class' => '1110779',
 +                                           'Header' => 'writer.h',
 +                                           'Line' => '36',
 +                                           'MnglName' => '_ZN7log4cxx7helpers6Writer14getStaticClassEv',
 +                                           'Private' => 1,
 +                                           'Return' => '57916',
++=======
+                             '1133996' => {
+                                            'Class' => '1133942',
+                                            'Header' => 'outputstream.h',
+                                            'Line' => '39',
+                                            'MnglName' => '_ZN7log4cxx7helpers12OutputStream14getStaticClassEv',
+                                            'Private' => 1,
+                                            'Return' => '53983',
++>>>>>>> master
                                             'ShortName' => 'getStaticClass',
 -                                           'Source' => 'outputstream.cpp',
 -                                           'SourceLine' => '25',
 +                                           'Source' => 'writer.cpp',
 +                                           'SourceLine' => '24',
                                             'Static' => 1
                                           },
++<<<<<<< HEAD
 +                            '1110909' => {
++=======
+                             '1134067' => {
++>>>>>>> master
                                             'Data' => 1,
 -                                           'Line' => '27',
 -                                           'MnglName' => '_ZN7log4cxx7classes33ByteArrayOutputStreamRegistrationE',
 +                                           'Line' => '36',
 +                                           'MnglName' => '_ZN7log4cxx7classes26BufferedWriterRegistrationE',
                                             'NameSpace' => 'log4cxx::classes',
++<<<<<<< HEAD
 +                                           'Return' => '57922',
 +                                           'ShortName' => 'BufferedWriterRegistration',
 +                                           'Source' => 'bufferedwriter.cpp'
 +                                         },
 +                            '11113119' => {
 +                                            'Class' => '1031950',
 +                                            'Header' => 'patternlayout.h',
 +                                            'Line' => '359',
 +                                            'MnglName' => '_ZN7log4cxx13PatternLayout14getStaticClassEv',
 +                                            'Private' => 1,
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'patternlayout.cpp',
 +                                            'SourceLine' => '80',
 +                                            'Static' => 1
 +                                          },
 +                            '11113133' => {
 +                                            'Class' => '1031950',
 +                                            'Header' => 'patternlayout.h',
 +                                            'Line' => '382',
 +                                            'MnglName' => '_ZN7log4cxx13PatternLayout20setConversionPatternERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '11889909'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'pattern',
 +                                                                  'type' => '241824'
 +                                                                }
 +                                                       },
 +                                            'Private' => 1,
 +                                            'Return' => '1',
 +                                            'ShortName' => 'setConversionPattern',
 +                                            'Source' => 'patternlayout.cpp',
 +                                            'SourceLine' => '100'
 +                                          },
 +                            '11113430' => {
 +                                            'Class' => '11113189',
 +                                            'Const' => 1,
 +                                            'Header' => 'odbcappender.h',
 +                                            'MnglName' => '_ZNK7log4cxx2db12ODBCAppender8getClassEv',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '11118007'
 +                                                                }
 +                                                       },
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getClass',
 +                                            'Source' => 'odbcappender.cpp',
 +                                            'SourceLine' => '92',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '0'
 +                                          },
 +                            '11113469' => {
 +                                            'Class' => '11113189',
 +                                            'Header' => 'odbcappender.h',
 +                                            'MnglName' => '_ZN7log4cxx2db12ODBCAppender14getStaticClassEv',
 +                                            'Return' => '57916',
 +                                            'ShortName' => 'getStaticClass',
 +                                            'Source' => 'odbcappender.cpp',
 +                                            'SourceLine' => '92',
 +                                            'Static' => 1
 +                                          },
 +                            '11113487' => {
 +                                            'Class' => '11113189',
 +                                            'Header' => 'odbcappender.h',
 +                                            'MnglName' => '_ZN7log4cxx2db12ODBCAppender13registerClassEv',
 +                                            'Return' => '57922',
 +                                            'ShortName' => 'registerClass',
 +                                            'Source' => 'odbcappender.cpp',
 +                                            'SourceLine' => '92',
 +                                            'Static' => 1
 +                                          },
 +                            '11113505' => {
 +                                            'Class' => '11113189',
 +                                            'Const' => 1,
 +                                            'Header' => 'odbcappender.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '103',
 +                                            'MnglName' => '_ZNK7log4cxx2db12ODBCAppender4castERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '11118007'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                                            'Return' => '53989',
+                                            'ShortName' => 'ByteArrayOutputStreamRegistration',
+                                            'Source' => 'bytearrayoutputstream.cpp'
+                                          },
+                             '11345202' => {
+                                             'Class' => '11013116',
+                                             'Data' => 1,
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '61',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParser11ESCAPE_CHARE',
+                                             'Return' => '334462',
+                                             'ShortName' => 'ESCAPE_CHAR',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '27'
+                                           },
+                             '1146830' => {
+                                            'Class' => '1133282',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStreamD0Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayOutputStream',
+                                            'Source' => 'bytearrayoutputstream.cpp',
+                                            'SourceLine' => '33',
+                                            'Virt' => 1
+                                          },
+                             '1146831' => {
+                                            'Class' => '1133282',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStreamD1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayOutputStream',
+                                            'Source' => 'bytearrayoutputstream.cpp',
+                                            'SourceLine' => '33',
+                                            'Virt' => 1
+                                          },
+                             '1146926' => {
+                                            'Class' => '1133282',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStreamD2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayOutputStream',
+                                            'Source' => 'bytearrayoutputstream.cpp',
+                                            'SourceLine' => '33',
+                                            'Virt' => 1
+                                          },
+                             '1147643' => {
+                                            'Class' => '1133282',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStreamC2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayOutputStream',
+                                            'Source' => 'bytearrayoutputstream.cpp',
+                                            'SourceLine' => '29'
+                                          },
+                             '1147644' => {
+                                            'Class' => '1133282',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStreamC1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134597'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ByteArrayOutputStream',
+                                            'Source' => 'bytearrayoutputstream.cpp',
+                                            'SourceLine' => '29'
+                                          },
+                             '11478654' => {
+                                             'Class' => '11013116',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '75',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParserC2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11344961'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'ShortName' => 'PatternParser',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '33'
+                                           },
+                             '11478655' => {
+                                             'Class' => '11013116',
+                                             'Constructor' => 1,
+                                             'Header' => 'patternparser.h',
+                                             'Line' => '75',
+                                             'MnglName' => '_ZN7log4cxx7pattern13PatternParserC1Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11344961'
+                                                                 }
+                                                        },
+                                             'Private' => 1,
+                                             'Reg' => {
+                                                        '0' => 'rdi'
+                                                      },
+                                             'ShortName' => 'PatternParser',
+                                             'Source' => 'patternparser.cpp',
+                                             'SourceLine' => '33'
+                                           },
+                             '1149667' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1133773',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '50',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream26ClazzByteArrayOutputStreamD0Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134620'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayOutputStream',
+                                            'Virt' => 1
+                                          },
+                             '1149668' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1133773',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '50',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream26ClazzByteArrayOutputStreamD1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134620'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayOutputStream',
+                                            'Virt' => 1
+                                          },
+                             '1149808' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1133773',
+                                            'Destructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '50',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream26ClazzByteArrayOutputStreamD2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134620'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayOutputStream',
+                                            'Virt' => 1
+                                          },
+                             '1149898' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1133773',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '50',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream26ClazzByteArrayOutputStreamC2Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134620'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayOutputStream'
+                                          },
+                             '1149899' => {
+                                            'Artificial' => 1,
+                                            'Class' => '1133773',
+                                            'Constructor' => 1,
+                                            'Header' => 'bytearrayoutputstream.h',
+                                            'InLine' => 1,
+                                            'Line' => '50',
+                                            'MnglName' => '_ZN7log4cxx7helpers21ByteArrayOutputStream26ClazzByteArrayOutputStreamC1Ev',
+                                            'Param' => {
+                                                         '0' => {
+                                                                  'name' => 'this',
+                                                                  'type' => '1134620'
+                                                                }
+                                                       },
+                                            'ShortName' => 'ClazzByteArrayOutputStream'
+                                          },
+                             '11539947' => {
+                                             'Class' => '52539',
+                                             'Destructor' => 1,
+                                             'Header' => 'pool.h',
+                                             'Line' => '37',
+                                             'MnglName' => '_ZN7log4cxx7helpers4PoolD2Ev',
+                                             'Param' => {
+                                                          '0' => {
+                                                                   'name' => 'this',
+                                                                   'type' => '11537649'
++>>>>>>> master
                                                                  }
                                                         },
 -                                            'ShortName' => 'Pool',
 -                                            'Source' => 'pool.cpp',
 -                                            'SourceLine' => '48'
 +                                            'Return' => '48436',
 +                                            'ShortName' => 'cast',
 +                                            'Virt' => 1,
 +                                            'VirtPos' => '4'
                                            },
++<<<<<<< HEAD
 +                            '11113549' => {
 +                                            'Class' => '11113189',
 +                                            'Const' => 1,
 +                                            'Header' => 'odbcappender.h',
 +                                            'InLine' => 2,
 +                                            'Line' => '106',
 +                                            'MnglName' => '_ZNK7log4cxx2db12ODBCAppender10instanceofERKNS_7helpers5ClassE',
 +                                            'Param' => {
 +                                                         '0' => {
 +                                                                  'name' => 'this',
 +                                                                  'type' => '11118007'
 +                                                                },
 +                                                         '1' => {
 +                                                                  'name' => 'clazz',
 +                                                                  'type' => '57916'
++=======
+                             '11540101' => {
+                                             'Class' => '52539',
+                                             'Constructor' => 1,
... 225563 lines suppressed ...