Beginning changes to code to allow serialization/deserialization to w…

…ork in restricted C++ environment (for EOSIO/eos#354)
arhag · Sep 28, 2017 · 1ec04ec · 1ec04ec
1 parent 69a38f4
commit 1ec04ec
Show file tree

Hide file tree

Showing 34 changed files with 998 additions and 884 deletions.
diff --git a/libraries/table/include/eos/table/dynamic_object.hpp b/libraries/table/include/eos/table/dynamic_object.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eos/types/raw_region.hpp>
+#include <eos/eoslib/raw_region.hpp>
 #include <eos/types/types_manager.hpp>
 
 namespace eos { namespace table {

diff --git a/libraries/table/include/eos/table/dynamic_table.hpp b/libraries/table/include/eos/table/dynamic_table.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <eos/table/dynamic_object.hpp>
-#include <eos/types/type_id.hpp>
+#include <eos/eoslib/type_id.hpp>
 #include <eos/types/types_manager.hpp>
 
 #include <type_traits>

diff --git a/libraries/types/CMakeLists.txt b/libraries/types/CMakeLists.txt
@@ -1,7 +1,7 @@
 
-file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/eos/types/*.hpp")
+file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/eos/types/*.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/include/eos/eoslib/*.hpp")
 
-add_definitions(-DBOOST_PP_VARIADICS)
+add_definitions(-DBOOST_PP_VARIADICS -DEOS_TYPES_FULL_CAPABILITY)
 
 add_library( eos_types 
  reflect.cpp 

diff --git a/libraries/types/field_metadata.cpp b/libraries/types/field_metadata.cpp
@@ -1,9 +1,11 @@
-#include <eos/types/field_metadata.hpp>
+#include <eos/eoslib/field_metadata.hpp>
+#include <eos/eoslib/exceptions.hpp>
 
+#ifdef EOS_TYPES_FULL_CAPABILITY
 #include <ostream>
 #include <iomanip>
-#include <stdexcept>
 #include <boost/io/ios_state.hpp>
+#endif
 
 namespace eos { namespace types {
 
@@ -28,12 +30,12 @@ namespace eos { namespace types {
  if( is_offset_in_bits() )
  {
  if( offset_window::get(_extra) >= offset_limit_in_bits )
- throw std::invalid_argument("Offset (specified in bits) is too large.");
+ EOS_ERROR(std::invalid_argument, "Offset (specified in bits) is too large.");
  }
  else
  {
  if( offset_window::get(_extra) >= offset_limit )
- throw std::invalid_argument("Offset is too large.");
+ EOS_ERROR(std::invalid_argument, "Offset is too large.");
  } 
  }
 
@@ -46,7 +48,7 @@ namespace eos { namespace types {
  : _tid(tid), _extra(0)
  {
  if( offset >= offset_limit )
- throw std::domain_error("Offset is too large"); 
+ EOS_ERROR(std::domain_error, "Offset is too large"); 
 
  offset_window::set(_extra, offset);
 
@@ -60,7 +62,7 @@ namespace eos { namespace types {
  void field_metadata::set_offset(uint32_t offset)
  {
  if( offset >= offset_limit )
- throw std::domain_error("Offset is too large.");
+ EOS_ERROR(std::domain_error, "Offset is too large.");
 
  if( is_offset_in_bits() )
  offset <<= 3;
@@ -71,14 +73,15 @@ namespace eos { namespace types {
  void field_metadata::set_offset_in_bits(uint32_t offset)
  {
  if( offset >= offset_limit_in_bits )
- throw std::domain_error("Offset is too large.");
+ EOS_ERROR(std::domain_error, "Offset is too large.");
 
  if( !is_offset_in_bits() )
  offset >>= 3;
 
  offset_window::set(_extra, offset);
  }
 
+#ifdef EOS_TYPES_FULL_CAPABILITY
  std::ostream& operator<<(std::ostream& os, const field_metadata& f)
  {
  boost::io::ios_flags_saver ifs( os );
@@ -104,6 +107,7 @@ namespace eos { namespace types {
 
  return os;
  }
+#endif
 
 } }