diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-03 15:53:54 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-03 15:53:54 +0100 |
commit | 8877f11f82037b1518bd04478aa229e86eef3d54 (patch) | |
tree | a811d96378d8c53c4e89966091ede110298b86b6 /storage | |
parent | 0e63320ed4803d38b44f380f3182abcf6d19381d (diff) |
Adjust forward declarations in storage.
Diffstat (limited to 'storage')
24 files changed, 39 insertions, 38 deletions
diff --git a/storage/src/tests/distributor/distributortestutil.h b/storage/src/tests/distributor/distributortestutil.h index 69b5a5cdf6a..10cc5eeaca1 100644 --- a/storage/src/tests/distributor/distributortestutil.h +++ b/storage/src/tests/distributor/distributortestutil.h @@ -13,7 +13,7 @@ namespace storage { -namespace framework { class TickingThreadPool; } +namespace framework { struct TickingThreadPool; } namespace distributor { diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.h b/storage/src/vespa/storage/bucketdb/bucketmanager.h index 8413c5a0f42..440e0d3b125 100644 --- a/storage/src/vespa/storage/bucketdb/bucketmanager.h +++ b/storage/src/vespa/storage/bucketdb/bucketmanager.h @@ -113,7 +113,7 @@ public: StorBucketDatabase::Entry getBucketInfo(const document::Bucket &id) const; private: - friend class BucketManagerTest; + friend struct BucketManagerTest; void run(framework::ThreadHandle&) override; diff --git a/storage/src/vespa/storage/bucketdb/lockablemap.h b/storage/src/vespa/storage/bucketdb/lockablemap.h index a4382ceb683..89be92d5921 100644 --- a/storage/src/vespa/storage/bucketdb/lockablemap.h +++ b/storage/src/vespa/storage/bucketdb/lockablemap.h @@ -34,10 +34,11 @@ public: typedef typename Map::value_type value_type; typedef typename Map::size_type size_type; using BucketId = document::BucketId; + struct WrappedEntry; /** Responsible for releasing lock in map when out of scope. */ class LockKeeper { - friend class LockableMap<Map>::WrappedEntry; + friend struct WrappedEntry; LockableMap<Map>& _map; key_type _key; bool _locked; diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h index 13de3416dce..102e27e44d0 100644 --- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h +++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h @@ -56,7 +56,7 @@ namespace storage { -class BucketReadState; +struct BucketReadState; class StorageBucketDBInitializer : public StorageLink, public framework::HtmlStatusReporter, diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.h b/storage/src/vespa/storage/bucketmover/bucketmover.h index 42cbf693fcb..2d706517ee0 100644 --- a/storage/src/vespa/storage/bucketmover/bucketmover.h +++ b/storage/src/vespa/storage/bucketmover/bucketmover.h @@ -71,7 +71,7 @@ public: RunStatistics& getLastRunStats() { return *_history.begin(); } private: - friend class BucketMoverTest; + friend struct BucketMoverTest; void startNewRun(); void queueNewMoves(); diff --git a/storage/src/vespa/storage/bucketmover/htmltable.cpp b/storage/src/vespa/storage/bucketmover/htmltable.cpp index e727fb41859..7596e221092 100644 --- a/storage/src/vespa/storage/bucketmover/htmltable.cpp +++ b/storage/src/vespa/storage/bucketmover/htmltable.cpp @@ -178,8 +178,8 @@ ValueColumn<T>::printValue(std::ostream& out, uint16_t row) { out << _valuePrinter.str(); } -template class ValueColumn<int64_t>; -template class ValueColumn<uint64_t>; -template class ValueColumn<double>; +template struct ValueColumn<int64_t>; +template struct ValueColumn<uint64_t>; +template struct ValueColumn<double>; } diff --git a/storage/src/vespa/storage/common/storagecomponent.h b/storage/src/vespa/storage/common/storagecomponent.h index 901594ade99..821cd43f21d 100644 --- a/storage/src/vespa/storage/common/storagecomponent.h +++ b/storage/src/vespa/storage/common/storagecomponent.h @@ -52,9 +52,9 @@ namespace storage { namespace lib { class Distribution; } -class NodeStateUpdater; +struct NodeStateUpdater; class PriorityMapper; -class StorageComponentRegister; +struct StorageComponentRegister; class StorageComponent : public framework::Component { public: diff --git a/storage/src/vespa/storage/common/storagelink.h b/storage/src/vespa/storage/common/storagelink.h index 8307c19dce6..f1f679a1e26 100644 --- a/storage/src/vespa/storage/common/storagelink.h +++ b/storage/src/vespa/storage/common/storagelink.h @@ -27,7 +27,7 @@ namespace storage { -class FileStorManagerTest; +struct FileStorManagerTest; class StorageLink : public document::Printable, public ChainedMessageSender, @@ -179,7 +179,7 @@ private: * Some unit tests wants access to private functions. They can do this * through the storage link test. */ - friend class StorageLinkTest; + friend struct StorageLinkTest; }; std::ostream& operator<<(std::ostream& out, StorageLink& link); diff --git a/storage/src/vespa/storage/common/storagelinkqueued.h b/storage/src/vespa/storage/common/storagelinkqueued.h index ee5573bcc22..9fa0099f9a1 100644 --- a/storage/src/vespa/storage/common/storagelinkqueued.h +++ b/storage/src/vespa/storage/common/storagelinkqueued.h @@ -25,7 +25,7 @@ namespace storage { namespace framework { - class ComponentRegister; + struct ComponentRegister; class Component; class Thread; } diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h index 9108abea2af..fb8a9fb4299 100644 --- a/storage/src/vespa/storage/distributor/distributor.h +++ b/storage/src/vespa/storage/distributor/distributor.h @@ -26,7 +26,7 @@ namespace storage { -class DoneInitializeHandler; +struct DoneInitializeHandler; class HostInfo; namespace distributor { diff --git a/storage/src/vespa/storage/distributor/operationowner.h b/storage/src/vespa/storage/distributor/operationowner.h index 330ffbd8dcf..bcd5a8419f5 100644 --- a/storage/src/vespa/storage/distributor/operationowner.h +++ b/storage/src/vespa/storage/distributor/operationowner.h @@ -7,7 +7,7 @@ #include <vespa/storage/common/storagelink.h> #include <vespa/vdslib/state/clusterstate.h> -namespace storage::framework { class Clock; } +namespace storage::framework { struct Clock; } namespace storage::distributor { diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h index b4f84d76649..bc0308d8ef5 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h @@ -11,7 +11,7 @@ namespace document { class Document; } -namespace storage { class VisitorMetricSet; } +namespace storage { struct VisitorMetricSet; } namespace storage::lib { class ClusterState; } namespace storage::distributor { diff --git a/storage/src/vespa/storage/distributor/statusdelegator.h b/storage/src/vespa/storage/distributor/statusdelegator.h index 0edb9a9689b..058553177fd 100644 --- a/storage/src/vespa/storage/distributor/statusdelegator.h +++ b/storage/src/vespa/storage/distributor/statusdelegator.h @@ -4,7 +4,7 @@ namespace storage { namespace distributor { -class DelegatedStatusRequest; +struct DelegatedStatusRequest; class StatusDelegator { diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h index c48f18b5e98..e94af34346a 100644 --- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h +++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h @@ -21,9 +21,9 @@ namespace storage { namespace framework { - class StatusReporterMap; - class ThreadHandle; - class ComponentRegister; + struct StatusReporterMap; + struct ThreadHandle; + struct ComponentRegister; class Thread; class HttpUrlPath; class Component; diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h index 02c959df2f0..8f0b060d4d6 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h @@ -33,10 +33,10 @@ namespace framework { } class FileStorHandlerImpl; -class FileStorMetrics; -class MessageSender; +struct FileStorMetrics; +struct MessageSender; class MountPointList; -class ServiceLayerComponentRegister; +struct ServiceLayerComponentRegister; class AbortBucketOperationsCommand; class FileStorHandler : public MessageSender { diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h index f9dcca4315b..fe9982018b9 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h @@ -73,7 +73,7 @@ public: using PriorityIdx = bmi::nth_index<PriorityQueue, 1>::type; using BucketIdx = bmi::nth_index<PriorityQueue, 2>::type; - class Disk; + struct Disk; class Stripe { public: diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h index 8c7e206237b..bfc89a70a85 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h @@ -38,7 +38,7 @@ namespace api { class BucketMergeTest; class DiskInfo; -class FileStorManagerTest; +struct FileStorManagerTest; class ReadBucketList; class ModifiedBucketCheckerThread; class BucketOwnershipNotifier; @@ -93,7 +93,7 @@ class FileStorManager : public StorageLinkQueued, std::vector<DiskThreads> getThreads() { return _disks; } friend class BucketMergeTest; - friend class FileStorManagerTest; + friend struct FileStorManagerTest; friend class MessageTest; public: diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h index c6f13ce1a4c..05389cec3da 100644 --- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h +++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h @@ -14,7 +14,7 @@ namespace storage { -namespace spi { class PersistenceProvider; } +namespace spi { struct PersistenceProvider; } class ModifiedBucketChecker : public StorageLink, diff --git a/storage/src/vespa/storage/storageserver/bouncer.h b/storage/src/vespa/storage/storageserver/bouncer.h index 83c0c82ff57..12a8a0f5636 100644 --- a/storage/src/vespa/storage/storageserver/bouncer.h +++ b/storage/src/vespa/storage/storageserver/bouncer.h @@ -24,7 +24,7 @@ namespace config { class ConfigUri; } namespace storage { -class BouncerMetrics; +struct BouncerMetrics; class Bouncer : public StorageLink, private StateListener, diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.h b/storage/src/vespa/storage/storageserver/communicationmanager.h index 1e777258bbb..c08ad214768 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.h +++ b/storage/src/vespa/storage/storageserver/communicationmanager.h @@ -37,7 +37,7 @@ namespace mbus { } namespace storage { -class BucketResolver; +struct BucketResolver; class VisitorMbusSession; class Visitor; class VisitorThread; @@ -146,7 +146,7 @@ private: void updateMetrics(const MetricLockGuard &) override; // Test needs access to configure() for live reconfig testing. - friend class CommunicationManagerTest; + friend struct CommunicationManagerTest; public: CommunicationManager(StorageComponentRegister& compReg, diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.h b/storage/src/vespa/storage/storageserver/documentapiconverter.h index 4587d9eb122..3a70e0f4b78 100644 --- a/storage/src/vespa/storage/storageserver/documentapiconverter.h +++ b/storage/src/vespa/storage/storageserver/documentapiconverter.h @@ -13,7 +13,7 @@ namespace api { class StorageReply; } -class BucketResolver; +struct BucketResolver; class PriorityConverter; /** Converts messages from storageapi to documentapi and diff --git a/storage/src/vespa/storage/storageserver/statemanager.h b/storage/src/vespa/storage/storageserver/statemanager.h index a10e8d01ee5..0bacd41f6d9 100644 --- a/storage/src/vespa/storage/storageserver/statemanager.h +++ b/storage/src/vespa/storage/storageserver/statemanager.h @@ -98,9 +98,9 @@ public: void immediately_send_get_node_state_replies() override; private: - class ExternalStateLock; - friend class ExternalStateLock; - friend class StateManagerTest; + struct ExternalStateLock; + friend struct ExternalStateLock; + friend struct StateManagerTest; void notifyStateListeners(); bool sendGetNodeStateReplies( diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h index a19fb2c0d64..ea1bf1027d4 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.h +++ b/storage/src/vespa/storage/storageserver/storagenode.h @@ -40,9 +40,9 @@ class StateManager; class MemoryStatusViewer; class StatusWebServer; class StorageLink; -class DeadLockDetector; -class StorageMetricSet; -class StorageNodeContext; +struct DeadLockDetector; +struct StorageMetricSet; +struct StorageNodeContext; class ApplicationGenerationFetcher; class StorageComponent; diff --git a/storage/src/vespa/storage/visiting/visitor.h b/storage/src/vespa/storage/visiting/visitor.h index f84b105f1ed..f8da49202ad 100644 --- a/storage/src/vespa/storage/visiting/visitor.h +++ b/storage/src/vespa/storage/visiting/visitor.h @@ -50,7 +50,7 @@ namespace framework { class MemoryAllocationType; } class GetIterReply; class CreateIteratorReply; class Visitor; -class VisitorThreadMetrics; +struct VisitorThreadMetrics; /** * To prevent circular dependency between visitors and visitor manager, this |