Skip to content

Commit c79f64d

Browse files
committed
Json: removed WT_CXX11 checks
1 parent 4a35c90 commit c79f64d

File tree

4 files changed

+0
-12
lines changed

4 files changed

+0
-12
lines changed

src/Wt/Json/Array

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99

1010
#include <string>
1111
#include <vector>
12-
#ifdef WT_CXX11
1312
#include <initializer_list>
14-
#endif // WT_CXX11
1513

1614
#include <Wt/Json/Value.h>
1715

@@ -45,7 +43,6 @@ public:
4543
*/
4644
Array& operator= (const Array& other);
4745

48-
#ifdef WT_CXX11
4946
/*! \brief Move constructor
5047
*/
5148
Array(Array&& other);
@@ -57,7 +54,6 @@ public:
5754
/*! \brief Assignment operator.
5855
*/
5956
Array& operator= (Array&& other);
60-
#endif
6157

6258
/*! \brief Empty array constant.
6359
*/

src/Wt/Json/Array.C

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Array& Array::operator= (const Array& other)
2525
return *this;
2626
}
2727

28-
#ifdef WT_CXX11
2928
Array::Array(Array&& other)
3029
: Impl(std::move(other))
3130
{ }
@@ -39,7 +38,6 @@ Array& Array::operator= (Array&& other)
3938
Impl::operator=(std::move(other));
4039
return *this;
4140
}
42-
#endif
4341

4442
Array Array::Empty;
4543

src/Wt/Json/Object

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#ifndef WT_JSON_OBJECT_H_
88
#define WT_JSON_OBJECT_H_
99

10-
#ifdef WT_CXX11
1110
#include <initializer_list>
12-
#endif // WT_CXX11
1311
#include <map>
1412
#include <set>
1513
#include <Wt/WException.h>
@@ -55,7 +53,6 @@ public:
5553
Object& operator= (const Object& other);
5654
//bool operator== (const Object& other) const;
5755
//bool operator!= (const Object& other) const;
58-
#ifdef WT_CXX11
5956
/*! \brief Move constructor.
6057
*/
6158
Object(Object&& other);
@@ -67,7 +64,6 @@ public:
6764
/*! \brief Move assignment operator.
6865
*/
6966
Object& operator= (Object&& other);
70-
#endif
7167

7268
/*! \brief Returns the key set.
7369
*

src/Wt/Json/Object.C

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Object& Object::operator= (const Object& other)
3131
return *this;
3232
}
3333

34-
#ifdef WT_CXX11
3534
Object::Object(Object&& other)
3635
: Impl(std::move(other))
3736
{ }
@@ -45,7 +44,6 @@ Object& Object::operator= (Object&& other)
4544
Impl::operator=(std::move(other));
4645
return *this;
4746
}
48-
#endif
4947

5048
std::set<std::string> Object::names() const
5149
{

0 commit comments

Comments
 (0)