]> granicus.if.org Git - clang/commit
Fix bug in clang-format while merging short function
authorDinesh Dwivedi <dinesh.d@samsung.com>
Mon, 5 May 2014 11:36:35 +0000 (11:36 +0000)
committerDinesh Dwivedi <dinesh.d@samsung.com>
Mon, 5 May 2014 11:36:35 +0000 (11:36 +0000)
commit4114947c775bbd2b0182a4aefc1c9fe2d4f9a1b0
tree8963364ad6b11358aa18bd0c2e6a911803d37a07
parentdb5c09f0d9f57df91c2e1fe8325dd9a757c848cb
Fix bug in clang-format while merging short function

Before:
    #ifdef _DEBUG
    int foo( int i = 0 )
    #else
    int foo( int i = 5 )
    #endif { return i; }

After:
    #ifdef _DEBUG
    int foo( int i = 0 )
    #else
    int foo( int i = 5 )
    #endif
    {
     return i;
    }

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207958 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Format/Format.cpp
unittests/Format/FormatTest.cpp