diff options
| author | Paul Eggert | 2011-11-19 19:07:02 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 19:07:02 -0800 |
| commit | 615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch) | |
| tree | e0458a9eac443c36a3a4bfa117fde01bbd6e4140 /test/cedet/tests/testpolymorph.cpp | |
| parent | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff) | |
| parent | e1dbe924b53c541fdf238a5a722b7177d5c8760b (diff) | |
| download | emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.zip | |
Merge from trunk.
Diffstat (limited to 'test/cedet/tests/testpolymorph.cpp')
| -rw-r--r-- | test/cedet/tests/testpolymorph.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp index 493b4344c17..9db2d51efe7 100644 --- a/test/cedet/tests/testpolymorph.cpp +++ b/test/cedet/tests/testpolymorph.cpp | |||
| @@ -50,7 +50,7 @@ namespace fcn_poly { | |||
| 50 | 50 | ||
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | // Test 3 - Methods w/ differet arg lists. | 53 | // Test 3 - Methods w/ different arg lists. |
| 54 | class meth_poly { | 54 | class meth_poly { |
| 55 | public: | 55 | public: |
| 56 | int pm_meth(void) { | 56 | int pm_meth(void) { |
| @@ -128,4 +128,3 @@ namespace template_multiple_spec { | |||
| 128 | 128 | ||
| 129 | 129 | ||
| 130 | // End of polymorphism test file. | 130 | // End of polymorphism test file. |
| 131 | |||