Adjust forward declarations in staging_vespalib.

4 files changed, 9 insertions, 9 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/metrics/counter.h b/staging_vespalib/src/vespa/vespalib/metrics/counter.h
index 18a40b4e344..4a7021d3887 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/counter.h
+++ b/staging_vespalib/src/vespa/vespalib/metrics/counter.h
@@ -9,7 +9,7 @@ namespace vespalib {
 namespace metrics {
 
 class MetricsManager;
-class CounterAggregator;
+struct CounterAggregator;
 
 
 /**
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/gauge.h b/staging_vespalib/src/vespa/vespalib/metrics/gauge.h
index 7eb223ecf44..cbdd857c052 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/gauge.h
+++ b/staging_vespalib/src/vespa/vespalib/metrics/gauge.h
@@ -9,7 +9,7 @@ namespace vespalib {
 namespace metrics {
 
 class MetricsManager;
-class GaugeAggregator;
+struct GaugeAggregator;
 
 /**
  * Represents a gauge metric that can be measured.
diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp b/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp
index 0510e51b373..e38c54aaba0 100644
--- a/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp
@@ -784,11 +784,11 @@ VESPALIB_PROGRAMOPTIONS_IMPL_ADDLISTARGUMENT(uint64_t, NumberOptionParser<uint64
 VESPALIB_PROGRAMOPTIONS_IMPL_ADDLISTARGUMENT(float, NumberOptionParser<float>);
 VESPALIB_PROGRAMOPTIONS_IMPL_ADDLISTARGUMENT(double, NumberOptionParser<double>);
 
-template class ProgramOptions::NumberOptionParser<int32_t>;
-template class ProgramOptions::NumberOptionParser<uint32_t>;
-template class ProgramOptions::NumberOptionParser<int64_t>;
-template class ProgramOptions::NumberOptionParser<uint64_t>;
-template class ProgramOptions::NumberOptionParser<float>;
-template class ProgramOptions::NumberOptionParser<double>;
+template struct ProgramOptions::NumberOptionParser<int32_t>;
+template struct ProgramOptions::NumberOptionParser<uint32_t>;
+template struct ProgramOptions::NumberOptionParser<int64_t>;
+template struct ProgramOptions::NumberOptionParser<uint64_t>;
+template struct ProgramOptions::NumberOptionParser<float>;
+template struct ProgramOptions::NumberOptionParser<double>;
 
 } // vespalib
diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.h b/staging_vespalib/src/vespa/vespalib/util/programoptions.h
index 6c8953b5b7a..654ca50543e 100644
--- a/staging_vespalib/src/vespa/vespalib/util/programoptions.h
+++ b/staging_vespalib/src/vespa/vespalib/util/programoptions.h
@@ -63,7 +63,7 @@ struct ProgramOptions {
         virtual void finalizeOptions() = 0;
     };
 
-    class OptionParser;
+    struct OptionParser;
 
     int _argc;
     const char* const* _argv;