changeset 29897:7c7599ad9c5a

Sparse.h: Use forward declaration for Array class * Sparse.h: Use forward declaration for Array class instead of including Array.h. * Sparse-C.cc, Sparse-b.cc, Sparse-d.cc: Include Array.h.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jul 2021 16:31:26 -0400
parents 0dd2742601e4
children 853e4b7ae0d5
files liboctave/array/Sparse-C.cc liboctave/array/Sparse-b.cc liboctave/array/Sparse-d.cc liboctave/array/Sparse.h
diffstat 4 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/Sparse-C.cc	Tue Jul 20 22:42:05 2021 +0200
+++ b/liboctave/array/Sparse-C.cc	Tue Jul 20 16:31:26 2021 -0400
@@ -32,6 +32,7 @@
 #include "oct-cmplx.h"
 #include "lo-mappers.h"
 #include "lo-ieee.h"
+#include "Array.h"
 #include "Sparse.h"
 #include "Sparse.cc"
 
--- a/liboctave/array/Sparse-b.cc	Tue Jul 20 22:42:05 2021 +0200
+++ b/liboctave/array/Sparse-b.cc	Tue Jul 20 16:31:26 2021 -0400
@@ -29,6 +29,7 @@
 
 // Instantiate Sparse matrix of double values.
 
+#include "Array.h"
 #include "Sparse.h"
 #include "Sparse.cc"
 
--- a/liboctave/array/Sparse-d.cc	Tue Jul 20 22:42:05 2021 +0200
+++ b/liboctave/array/Sparse-d.cc	Tue Jul 20 16:31:26 2021 -0400
@@ -30,6 +30,7 @@
 // Instantiate Sparse matrix of double values.
 
 #include "lo-mappers.h"
+#include "Array.h"
 #include "Sparse.h"
 #include "Sparse.cc"
 
--- a/liboctave/array/Sparse.h	Tue Jul 20 22:42:05 2021 +0200
+++ b/liboctave/array/Sparse.h	Tue Jul 20 16:31:26 2021 -0400
@@ -35,9 +35,8 @@
 #include <iosfwd>
 #include <string>
 
-#include "Array.h"
-
 class PermMatrix;
+template <typename T> class Array;
 
 // Two dimensional sparse class.  Handles the reference counting for
 // all the derived classes.