Skip to content

Commit 8c3d008

Browse files
committed
Several changes:
- Wt 4 specific: - Fix issue #5796: implement WGenericMatrix without Boost - Added move constructors/assignment operators to WString - Merges from master: - Fix #5798 - Fix test.wt & test.http build for ARM Add thread linker flags to fix build errors when building for ARM (PR emweb#117 by Mark O'Donovan (modonovan@biotector.com)) - Fix #5790: make it possible to set config file when argc = 0 - Fix #5799: allow to add entry points safely when server is running
1 parent 7c6ce33 commit 8c3d008

File tree

16 files changed

+782
-161
lines changed

16 files changed

+782
-161
lines changed

doc/tutorial/wt.doc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ equivalent).
263263
.Inside +WRun()+
264264
****
265265
+WRun()+ is actually a convenience function which creates and
266-
configures a +{doc}:classWt_1_1WServer[WServer]+ instance. If you want
266+
configures a +{doc}classWt_1_1WServer.html[WServer]+ instance. If you want
267267
more control, for example if you have multiple “entry points”, or want
268268
to control the server starting and stopping, you can use the +WServer+
269269
API directly instead.

src/Wt/Json/Value

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ public:
114114
*/
115115
Value(const WT_USTRING& value);
116116

117+
/*! \brief Creates a value from a string.
118+
*
119+
* This creates a \link Wt::Json::Type::String
120+
* Json::Type::String\endlink value.
121+
*/
122+
Value(WT_USTRING&& value);
123+
117124
/*! \brief Creates a value from a boolean.
118125
*
119126
* This creates a \link Wt::Json::Type::Bool

src/Wt/Json/Value.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ Value::Value(const WT_USTRING& value)
9494
: v_(value)
9595
{ }
9696

97+
Value::Value(WT_USTRING&& value)
98+
: v_(std::move(value))
99+
{ }
100+
97101
Value::Value(int value)
98102
: v_(value)
99103
{ }

0 commit comments

Comments
 (0)