rexy712/matrix_thing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix infinite recursion

Browse Source
This commit is contained in:
rexy712 2019-10-28 13:06:23 -07:00
parent 89741e3575
commit 2f17fe1c1a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/matrix/iterable.hpp
View File

@ -74,7 +74,7 @@ namespace matrix::sync{
m_event(i.m_event), m_roomid(i.m_roomid){}
constexpr room_event_iterator& operator=(const room_event_iterator& i){
room_event_iterator tmp(i);
return (*this = tmp);
return (*this = std::move(tmp));
}
constexpr room_event_iterator& operator=(room_event_iterator&& i){
m_event = i.m_event;

12
include/matrix/json_targets.hpp
View File

@ -15,10 +15,10 @@ namespace matrix::json{
constexpr raii::static_string size(void){return "size"_ss;}
constexpr raii::static_string thumbinfo(void){return "thumbnail_info"_ss;}
namespace thumbnail{
constexpr raii::static_string height(void){return height();}
constexpr raii::static_string width(void){return width();}
constexpr raii::static_string mimetype(void){return mimetype();}
constexpr raii::static_string size(void){return size();}
constexpr raii::static_string height(void){return message::infobody::height();}
constexpr raii::static_string width(void){return message::infobody::width();}
constexpr raii::static_string mimetype(void){return message::infobody::mimetype();}
constexpr raii::static_string size(void){return message::infobody::size();}
}
constexpr raii::static_string thumburl(void){return "thumbnail_url"_ss;}
}
@ -32,10 +32,10 @@ namespace matrix::json{
constexpr raii::static_string password(void){return "password"_ss;}
constexpr raii::static_string newpassword(void){return "new_password"_ss;}
namespace identifierbody{
constexpr raii::static_string type(void){return type();}
constexpr raii::static_string type(void){return auth::type();}
constexpr raii::static_string user(void){return "user"_ss;}
constexpr raii::static_string session(void){return "session"_ss;}
constexpr raii::static_string password(void){return password();}
constexpr raii::static_string password(void){return auth::password();}
}
}