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

Merge branch 'master' of https://github.com/InvictusInnovations/fc

Browse source
This commit is contained in:
Daniel Larimer 2014-06-26 11:25:12 -04:00
commit bb40828953
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fc/reflect/typename.hpp
View file

@ -4,6 +4,8 @@
namespace fc { namespace fc {
class value; class value;
class exception; class exception;
namespace ip { class address; }
template<typename T> class get_typename{}; template<typename T> class get_typename{};
template<> struct get_typename<int32_t> { static const char* name() { return "int32_t"; } }; template<> struct get_typename<int32_t> { static const char* name() { return "int32_t"; } };
template<> struct get_typename<int64_t> { static const char* name() { return "int64_t"; } }; template<> struct get_typename<int64_t> { static const char* name() { return "int64_t"; } };

4
src/network/udt_socket.cpp
View file

@ -5,7 +5,9 @@
#include <fc/network/ip.hpp> #include <fc/network/ip.hpp>
#include <udt.h> #include <udt.h>
#include <arpa/inet.h> #ifndef WIN32
# include <arpa/inet.h>
#endif
namespace fc { namespace fc {