summaryrefslogtreecommitdiffstats
path: root/libcxx/test/utilities/tuple/tuple.tuple
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/utilities/tuple/tuple.tuple')
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h26
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp2
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp2
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()
{
OpenPOWER on IntegriCloud