diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2013-12-02 17:00:56 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2013-12-02 17:00:56 +0000 |
| commit | a26fcc7989405df40ba181bd13678cab6f651723 (patch) | |
| tree | c72e9f7b0193b579fe18814516f73894e2f73c65 /libcxx/test/utilities/tuple | |
| parent | f4e6b29a03dc48e358c117609ba25fe64a53fa2f (diff) | |
| download | bcm5719-llvm-a26fcc7989405df40ba181bd13678cab6f651723.tar.gz bcm5719-llvm-a26fcc7989405df40ba181bd13678cab6f651723.zip | |
Found two identical files named 'DefaultOnly.h' in the libcxx test suite. Moved one to /support, removed the other, and iupdated all the includes. No functionality change
llvm-svn: 196118
Diffstat (limited to 'libcxx/test/utilities/tuple')
3 files changed, 2 insertions, 28 deletions
diff --git a/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h b/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h deleted file mode 100644 index bdcf46d19ff..00000000000 --- a/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef DEFAULTONLY_H -#define DEFAULTONLY_H - -#include <cassert> - -class DefaultOnly -{ - int data_; - - DefaultOnly(const DefaultOnly&); - DefaultOnly& operator=(const DefaultOnly&); -public: - static int count; - - DefaultOnly() : data_(-1) {++count;} - ~DefaultOnly() {data_ = 0; --count;} - - friend bool operator==(const DefaultOnly& x, const DefaultOnly& y) - {return x.data_ == y.data_;} - friend bool operator< (const DefaultOnly& x, const DefaultOnly& y) - {return x.data_ < y.data_;} -}; - -int DefaultOnly::count = 0; - -#endif // DEFAULTONLY_H diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp index d25bdf9f754..cfbdaedfc5a 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp @@ -17,7 +17,7 @@ #include <tuple> #include <cassert> -#include "../DefaultOnly.h" +#include "DefaultOnly.h" #include "../allocators.h" #include "../alloc_first.h" #include "../alloc_last.h" diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp index 84ecd8d2cd1..b72b77ee97c 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../DefaultOnly.h" +#include "DefaultOnly.h" int main() { |
