Merge branch '261-bugfix-byid-ns' into develop

steemit · Aug 10, 2016 · 8885009 · 8885009
2 parents 80c3fbc + 48999da
commit 8885009
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/libraries/chain/include/steemit/chain/transaction_object.hpp b/libraries/chain/include/steemit/chain/transaction_object.hpp
@@ -34,7 +34,6 @@ namespace steemit { namespace chain {
    };
 
    struct by_expiration;
-   struct by_id;
    struct by_trx_id;
    typedef multi_index_container<
       transaction_object,

diff --git a/libraries/plugins/follow/include/steemit/follow/follow_objects.hpp b/libraries/plugins/follow/include/steemit/follow/follow_objects.hpp
@@ -65,7 +65,6 @@ class reputation_object : public abstract_object< reputation_object >
 
 struct by_following_follower;
 struct by_follower_following;
-struct by_id;
 
 using namespace boost::multi_index;
 

diff --git a/libraries/plugins/market_history/include/steemit/market_history/market_history_plugin.hpp b/libraries/plugins/market_history/include/steemit/market_history/market_history_plugin.hpp
@@ -83,7 +83,6 @@ struct order_history_object : public abstract_object< order_history_object >
    fill_order_operation op;
 };
 
-//struct by_id;
 struct by_bucket;
 typedef multi_index_container<
    bucket_object,

diff --git a/libraries/plugins/private_message/include/steemit/private_message/private_message_plugin.hpp b/libraries/plugins/private_message/include/steemit/private_message/private_message_plugin.hpp
@@ -35,6 +35,7 @@
 namespace steemit { namespace private_message {
 using namespace chain;
 using app::application;
+using graphene::db::by_id;
 
 //
 // Plugins should #define their SPACE_ID's so plugins with
@@ -98,7 +99,6 @@ struct extended_message_object : public message_object {
 
 struct by_to_date;
 struct by_from_date;
-struct by_id;
 
 using namespace boost::multi_index;
 

diff --git a/libraries/plugins/tags/include/steemit/tags/tags_plugin.hpp b/libraries/plugins/tags/include/steemit/tags/tags_plugin.hpp
@@ -84,7 +84,6 @@ class  tag_object : public abstract_object<tag_object> {
 };
 
 
-struct by_id;
 struct by_cashout; /// all posts regardless of depth
 struct by_net_rshares; /// all comments regardless of depth
 struct by_parent_created;