All fixes from bitshares/bitshares-fc#120 except strings

external_plugins/multiparty_messaging/include/sophiatx/plugins/multiparty_messaging/multiparty_messaging_api.hpp

@@ -7,7 +7,6 @@
 
 #include <fc/optional.hpp>
 #include <fc/variant.hpp>
-#include <fc/vector.hpp>
 
 namespace sophiatx { namespace plugins { namespace multiparty_messaging {
 
@@ -30,7 +29,7 @@ class api_group_object {
 
    string description;
 
-   vector < account_name_type > members;
+   std::vector < account_name_type > members;
    account_name_type admin;
 
    fc::sha256 group_key;
@@ -49,8 +48,8 @@ class api_message_object {
    account_name_type group_name;
    uint32_t          sequence;
    account_name_type sender;
-   vector < account_name_type > recipients;
-   vector<char>      data;
+   std::vector < account_name_type > recipients;
+   std::vector<char>      data;
    bool system_message = false;
 };
 
@@ -82,7 +81,7 @@ struct list_messages_args{
 typedef vector<api_message_object> list_messages_return;
 
 struct create_group_args{
-   vector<account_name_type> members;
+   std::vector<account_name_type> members;
    string description;
    account_name_type admin;
 };
@@ -94,7 +93,7 @@ struct create_group_return{
 
 struct add_group_participants_args{
    account_name_type group_name;
-   vector<account_name_type> new_members;
+   std::vector<account_name_type> new_members;
    account_name_type admin;
    bool check_members;
 };
@@ -103,7 +102,7 @@ typedef std::map<account_name_type, group_meta> add_group_participants_return;
 
 struct delete_group_participants_args{
    account_name_type group_name;
-   vector<account_name_type> deleted_members;
+   std::vector<account_name_type> deleted_members;
    account_name_type admin;
    bool check_members;
 };
@@ -128,7 +127,7 @@ typedef std::map<account_name_type, group_meta> disband_group_return;
 struct send_group_message_args{
    account_name_type group_name;
    account_name_type sender;
-   vector<char> data;
+   std::vector<char> data;
 };
 
 typedef std::map<account_name_type, group_meta> send_group_message_return;

external_plugins/track_and_trace/include/sophiatx/plugins/track_and_trace/track_and_trace_api.hpp

@@ -6,7 +6,6 @@
 
 #include <fc/optional.hpp>
 #include <fc/variant.hpp>
-#include <fc/vector.hpp>
 
 namespace sophiatx { namespace plugins { namespace track_and_trace_plugin {
 
@@ -32,7 +31,7 @@ struct get_holdings_args
 
 struct get_holdings_return
 {
-   vector<tracked_object_name_type> serials;
+   std::vector<tracked_object_name_type> serials;
 };
 
 struct get_transfer_requests_args
@@ -42,7 +41,7 @@ struct get_transfer_requests_args
 
 struct get_transfer_requests_return
 {
-   vector<tracked_object_name_type> serials;
+   std::vector<tracked_object_name_type> serials;
 };
 
 struct get_item_details_args
@@ -77,7 +76,7 @@ struct tracked_object_history_item{
 
 struct get_tracked_object_history_return
 {
-   vector<tracked_object_history_item> history_items;
+   std::vector<tracked_object_history_item> history_items;
 };
 
 class track_and_trace_api

libraries/fc/include/fc/crypto/equihash.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include <fc/crypto/sha256.hpp>
-#include <fc/vector.hpp>
 
 namespace fc { namespace equihash {
 

libraries/fc/include/fc/crypto/sha1.hpp

@@ -1,23 +1,23 @@
 #pragma once
 #include <fc/fwd.hpp>
-#include <fc/string.hpp>
+#include <string>
 
 namespace fc{
 
 class sha1 
 {
   public:
     sha1();
-    explicit sha1( const string& hex_str );
+    explicit sha1( const std::string& hex_str );
 
-    string str()const;
-    operator string()const;
+    std::string str()const;
+    operator std::string()const;
 
     char*    data()const;
     size_t data_size()const { return 20; }
 
     static sha1 hash( const char* d, uint32_t dlen );
-    static sha1 hash( const string& );
+    static sha1 hash( const std::string& );
 
     template<typename T>
     static sha1 hash( const T& t ) 

libraries/fc/include/fc/crypto/sha224.hpp

@@ -2,7 +2,7 @@
 #include <unordered_map>
 #include <fc/fwd.hpp>
 #include <fc/io/raw_fwd.hpp>
-#include <fc/string.hpp>
+
 
 namespace fc
 {
@@ -11,16 +11,16 @@ class sha224
 {
   public:
     sha224();
-    explicit sha224( const string& hex_str );
+    explicit sha224( const std::string& hex_str );
 
-    string str()const;
-    operator string()const;
+    std::string str()const;
+    operator std::string()const;
 
     char*    data()const;
     size_t data_size()const { return 224 / 8; }
 
     static sha224 hash( const char* d, uint32_t dlen );
-    static sha224 hash( const string& );
+    static sha224 hash( const std::string& );
 
     template<typename T>
     static sha224 hash( const T& t ) 

libraries/fc/include/fc/network/http/connection.hpp

@@ -1,7 +1,7 @@
 #pragma once
-#include <fc/vector.hpp>
 #include <fc/string.hpp>
 #include <memory>
+#include <vector>
 
 namespace fc { 
   namespace ip { class endpoint; }

libraries/fc/include/fc/network/resolve.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include <fc/vector.hpp>
 #include <fc/network/ip.hpp>
 
 namespace fc

libraries/fc/include/fc/network/tcp_socket.hpp

@@ -52,7 +52,7 @@ namespace fc {
       friend class tcp_server;
       class impl;
       #ifdef _WIN64
-      fc::fwd<impl,0x81> my;
+      fc::fwd<impl,0x88> my;
       #else
       fc::fwd<impl,0x54> my;
       #endif

libraries/fc/include/fc/reflect/typename.hpp

@@ -3,6 +3,7 @@
 #include <deque>
 #include <map>
 #include <vector>
+#include <string>
 
 #include <fc/string.hpp>
 #include <fc/optional.hpp>