Merge #428 and #429 to branch 1.1 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 24 Oct 2011 21:39:34 +0200
branch1.1
changeset 10892b47dbd6612c
parent 1082 54abdfda0076
parent 1087 b96574ff36ec
child 1093 472b7885ae46
Merge #428 and #429 to branch 1.1
lemon/Makefile.am
test/lgf_test.cc
     1.1 --- a/lemon/Makefile.am	Mon Aug 08 13:35:38 2011 +0200
     1.2 +++ b/lemon/Makefile.am	Mon Oct 24 21:39:34 2011 +0200
     1.3 @@ -1,5 +1,6 @@
     1.4  EXTRA_DIST += \
     1.5  	lemon/lemon.pc.in \
     1.6 +	lemon/lemon.pc.cmake \
     1.7  	lemon/CMakeLists.txt \
     1.8  	lemon/config.h.cmake
     1.9  
     2.1 --- a/test/lgf_test.cc	Mon Aug 08 13:35:38 2011 +0200
     2.2 +++ b/test/lgf_test.cc	Mon Oct 24 21:39:34 2011 +0200
     2.3 @@ -117,7 +117,7 @@
     2.4        digraphReader(d, input).
     2.5          run();
     2.6      }
     2.7 -    catch (FormatError& error)
     2.8 +    catch (FormatError&) 
     2.9        {
    2.10          ok = true;
    2.11        }
    2.12 @@ -131,7 +131,7 @@
    2.13        graphReader(g, input).
    2.14          run();
    2.15      }
    2.16 -    catch (FormatError& error)
    2.17 +    catch (FormatError&)
    2.18        {
    2.19          ok = true;
    2.20        }
    2.21 @@ -146,7 +146,7 @@
    2.22        digraphReader(d, input).
    2.23          run();
    2.24      }
    2.25 -    catch (FormatError& error)
    2.26 +    catch (FormatError&)
    2.27        {
    2.28          ok = true;
    2.29        }
    2.30 @@ -160,7 +160,7 @@
    2.31        graphReader(g, input).
    2.32          run();
    2.33      }
    2.34 -    catch (FormatError& error)
    2.35 +    catch (FormatError&)
    2.36        {
    2.37          ok = true;
    2.38        }