mirror of
https://github.com/Gericom/teak-llvm.git
synced 2025-06-26 14:58:59 -04:00
0333dd9563
I think there must be a bug in git-llvm causing parent directories to be deleted when the diff deletes files in a subdirectory. Perhaps it is Windows-only. There has been a behavior change, so some of these tests now fail. I have marked them XFAIL and will fix them in a follow-up to separate the changes. llvm-svn: 360699
28 lines
370 B
C++
28 lines
370 B
C++
// Merge success
|
|
namespace N1 {
|
|
int x;
|
|
}
|
|
|
|
// Merge multiple namespaces
|
|
namespace N2 {
|
|
extern int x;
|
|
}
|
|
namespace N2 {
|
|
extern float y;
|
|
}
|
|
|
|
// Merge namespace with conflict
|
|
namespace N3 {
|
|
extern float z;
|
|
}
|
|
|
|
namespace AliasWithSameName = N3;
|
|
|
|
namespace TestUnresolvedTypenameAndValueDecls {
|
|
template <class T> class Base {
|
|
public:
|
|
typedef T foo;
|
|
void bar();
|
|
};
|
|
}
|