LEMON/LEMON-official Changeset - r1090:c1a959df3b2c

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r1090:c1a959df3b2c

« 1087:b96574
« 1085:7340bd

1094:140fac »

r1090:c1a959df3b2c

Mon, 24 Oct 2011 21:40:31

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge #428 and #429 to branch 1.2

0 2 0

merge 1.2

2 files changed with 5 insertions and 4 deletions:

lemon/Makefile.am

test/lgf_test.cc

↑ Collapse diff ↑

lemon/Makefile.am

Show inline comments

 		EXTRA_DIST += \
 			lemon/lemon.pc.in \
 			lemon/lemon.pc.cmake \
 			lemon/CMakeLists.txt \
 			lemon/config.h.cmake
 		pkgconfig_DATA += lemon/lemon.pc
 		lib_LTLIBRARIES += lemon/libemon.la
 		lemon_libemon_la_SOURCES = \

test/lgf_test.cc

Show inline comments

@@ -112,58 +112,58 @@
  {
    ListDigraph d;
    std::istringstream input(test_lgf_bad1);
    bool ok=false;
    try {
      digraphReader(d, input).
        run();
    }
    catch (FormatError& error)
    catch (FormatError&) 
      {
        ok = true;
      }
    check(ok,"FormatError exception should have occured");
  }
  {
    ListGraph g;
    std::istringstream input(test_lgf_bad1);
    bool ok=false;
    try {
      graphReader(g, input).
        run();
    }
    catch (FormatError& error)
    catch (FormatError&)
      {
        ok = true;
      }
    check(ok,"FormatError exception should have occured");
  }

  {
    ListDigraph d;
    std::istringstream input(test_lgf_bad2);
    bool ok=false;
    try {
      digraphReader(d, input).
        run();
    }
    catch (FormatError& error)
    catch (FormatError&)
      {
        ok = true;
      }
    check(ok,"FormatError exception should have occured");
  }
  {
    ListGraph g;
    std::istringstream input(test_lgf_bad2);
    bool ok=false;
    try {
      graphReader(g, input).
        run();
    }
    catch (FormatError& error)
    catch (FormatError&)
      {
        ok = true;
      }
    check(ok,"FormatError exception should have occured");
  }
}

0 comments (0 inline)

...	...	@@ -112,58 +112,58 @@
112	112	{
113	113	ListDigraph d;
114	114	std::istringstream input(test_lgf_bad1);
115	115	bool ok=false;
116	116	try {
117	117	digraphReader(d, input).
118	118	run();
119	119	}
120		catch (FormatError& ~~error)~~
	120	catch (FormatError&)
121	121	{
122	122	ok = true;
123	123	}
124	124	check(ok,"FormatError exception should have occured");
125	125	}
126	126	{
127	127	ListGraph g;
128	128	std::istringstream input(test_lgf_bad1);
129	129	bool ok=false;
130	130	try {
131	131	graphReader(g, input).
132	132	run();
133	133	}
134		catch (FormatError& ~~error~~)
	134	catch (FormatError&)
135	135	{
136	136	ok = true;
137	137	}
138	138	check(ok,"FormatError exception should have occured");
139	139	}
140	140
141	141	{
142	142	ListDigraph d;
143	143	std::istringstream input(test_lgf_bad2);
144	144	bool ok=false;
145	145	try {
146	146	digraphReader(d, input).
147	147	run();
148	148	}
149		catch (FormatError& ~~error~~)
	149	catch (FormatError&)
150	150	{
151	151	ok = true;
152	152	}
153	153	check(ok,"FormatError exception should have occured");
154	154	}
155	155	{
156	156	ListGraph g;
157	157	std::istringstream input(test_lgf_bad2);
158	158	bool ok=false;
159	159	try {
160	160	graphReader(g, input).
161	161	run();
162	162	}
163		catch (FormatError& ~~error~~)
	163	catch (FormatError&)
164	164	{
165	165	ok = true;
166	166	}
167	167	check(ok,"FormatError exception should have occured");
168	168	}
169	169	}

RhodeCode

Login to your account