Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bugs in optional implementation

Browse source
This commit is contained in:
Daniel Larimer 2013-07-05 19:48:59 -04:00
parent 58d950b56f
commit 7e61059806
3 changed files with 94 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/fc/optional.hpp
View file

@ -2,6 +2,8 @@
#include <fc/utility.hpp> #include <fc/utility.hpp>
#include <assert.h> #include <assert.h>
#include <stdio.h>
namespace fc { namespace fc {
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)
@ -45,17 +47,18 @@ namespace fc {
template<typename U> template<typename U>
optional( U&& u ) optional( U&& u )
:_valid(false) :_valid(true)
{ {
new (ptr()) T( fc::forward<U>(u) ); new ((char*)ptr()) T( fc::forward<U>(u) );
_valid = true;
} }
template<typename U> template<typename U>
optional& operator=( U&& u ) optional& operator=( U&& u )
{ {
reset(); reset();
fprintf( stderr, "optional==(U&&)...\n" );
new (ptr()) T( fc::forward<U>(u) ); new (ptr()) T( fc::forward<U>(u) );
_valid = true;
return *this; return *this;
} }
@ -77,8 +80,10 @@ namespace fc {
{ {
if (this != &o) if (this != &o)
{ {
if( _valid && o._valid ) { if( _valid && o._valid )
{
ref() = fc::move(*o); ref() = fc::move(*o);
o.reset();
} else if ( !_valid && o._valid ) { } else if ( !_valid && o._valid ) {
*this = fc::move(*o); *this = fc::move(*o);
} else if (_valid) { } else if (_valid) {
@ -110,8 +115,10 @@ namespace fc {
{ {
if( _valid ) if( _valid )
{ {
fprintf( stderr, "optiona::reset %p\n", this );
ref().~T(); // cal destructor ref().~T(); // cal destructor
} }
_valid = false;
} }
T& ref() { return *ptr(); } T& ref() { return *ptr(); }
const T& ref()const { return *ptr(); } const T& ref()const { return *ptr(); }