Mercurial > hg > octave-thorsten

changeset 9237:3c1762c7e787

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing xxx_API decoration and remove misplaced ones
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 21 May 2009 21:28:47 +0100
parents c02224afead6
children 0ae2b6617005
files liboctave/Array-C.cc liboctave/Array-d.cc liboctave/Array-f.cc liboctave/Array-fC.cc liboctave/Array.cc liboctave/CColVector.h liboctave/CDiagMatrix.h liboctave/CMatrix.h liboctave/CNDArray.h liboctave/ChangeLog liboctave/DET.h liboctave/PermMatrix.h liboctave/dDiagMatrix.h liboctave/fCColVector.h liboctave/fCDiagMatrix.h liboctave/fCMatrix.h liboctave/fCNDArray.h liboctave/fDiagMatrix.h liboctave/oct-inttypes.cc liboctave/oct-locbuf.h src/ChangeLog src/debug.h src/input.h src/pt-eval.h src/toplev.h
diffstat 25 files changed, 86 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array-C.cc
+++ b/liboctave/Array-C.cc
@@ -106,6 +106,7 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+template class OCTAVE_API DiagArray2<Complex>::Proxy;
 template class OCTAVE_API DiagArray2<Complex>;
 
 /*
--- a/liboctave/Array-d.cc
+++ b/liboctave/Array-d.cc
@@ -102,6 +102,7 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+template class OCTAVE_API DiagArray2<double>::Proxy;
 template class OCTAVE_API DiagArray2<double>;
 
 /*
--- a/liboctave/Array-f.cc
+++ b/liboctave/Array-f.cc
@@ -102,6 +102,7 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+template class OCTAVE_API DiagArray2<float>::Proxy;
 template class OCTAVE_API DiagArray2<float>;
 
 /*
--- a/liboctave/Array-fC.cc
+++ b/liboctave/Array-fC.cc
@@ -107,6 +107,7 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+template class OCTAVE_API DiagArray2<FloatComplex>::Proxy;
 template class OCTAVE_API DiagArray2<FloatComplex>;
 
 /*
--- a/liboctave/Array.cc
+++ b/liboctave/Array.cc
@@ -2546,7 +2546,7 @@
 }
 
 
-#define INSTANTIATE_ARRAY_SORT(T) template class octave_sort<T>;
+#define INSTANTIATE_ARRAY_SORT(T) template class OCTAVE_API octave_sort<T>;
 
 #define NO_INSTANTIATE_ARRAY_SORT(T) \
  \
--- a/liboctave/CColVector.h
+++ b/liboctave/CColVector.h
@@ -75,7 +75,7 @@
   ComplexRowVector hermitian (void) const;
   ComplexRowVector transpose (void) const;
 
-  friend ComplexColumnVector conj (const ComplexColumnVector& a);
+  friend OCTAVE_API ComplexColumnVector conj (const ComplexColumnVector& a);
 
   // resize is the destructive equivalent for this one
 
@@ -90,26 +90,26 @@
 
   // matrix by column vector -> column vector operations
 
-  friend ComplexColumnVector operator * (const ComplexMatrix& a,
+  friend OCTAVE_API ComplexColumnVector operator * (const ComplexMatrix& a,
 					 const ColumnVector& b);
 
-  friend ComplexColumnVector operator * (const ComplexMatrix& a,
+  friend OCTAVE_API ComplexColumnVector operator * (const ComplexMatrix& a,
 					 const ComplexColumnVector& b);
 
   // matrix by column vector -> column vector operations
 
-  friend ComplexColumnVector operator * (const Matrix& a,
+  friend OCTAVE_API ComplexColumnVector operator * (const Matrix& a,
 					 const ComplexColumnVector& b);
 
   // diagonal matrix by column vector -> column vector operations
 
-  friend ComplexColumnVector operator * (const DiagMatrix& a,
+  friend OCTAVE_API ComplexColumnVector operator * (const DiagMatrix& a,
 					 const ComplexColumnVector& b);
 
-  friend ComplexColumnVector operator * (const ComplexDiagMatrix& a,
+  friend OCTAVE_API ComplexColumnVector operator * (const ComplexDiagMatrix& a,
 					 const ColumnVector& b);
 
-  friend ComplexColumnVector operator * (const ComplexDiagMatrix& a,
+  friend OCTAVE_API ComplexColumnVector operator * (const ComplexDiagMatrix& a,
 					 const ComplexColumnVector& b);
 
   // other operations
@@ -125,8 +125,8 @@
 
   // i/o
 
-  friend std::ostream& operator << (std::ostream& os, const ComplexColumnVector& a);
-  friend std::istream& operator >> (std::istream& is, ComplexColumnVector& a);
+  friend OCTAVE_API std::ostream& operator << (std::ostream& os, const ComplexColumnVector& a);
+  friend OCTAVE_API std::istream& operator >> (std::istream& is, ComplexColumnVector& a);
 
 private:
 
--- a/liboctave/CDiagMatrix.h
+++ b/liboctave/CDiagMatrix.h
@@ -35,6 +35,7 @@
 #include "mx-defs.h"
 
 class
+OCTAVE_API
 ComplexDiagMatrix : public MDiagArray2<Complex>
 {
 public:
@@ -96,7 +97,7 @@
   ComplexDiagMatrix transpose (void) const { return MDiagArray2<Complex>::transpose(); }
   DiagMatrix abs (void) const; 
 
-  friend ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
+  friend OCTAVE_API ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
 
   // resize is the destructive analog for this one
 
@@ -139,17 +140,17 @@
     : MDiagArray2<Complex> (d, nr, nc) { }
 };
 
-ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
+OCTAVE_API ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
 
 // diagonal matrix by diagonal matrix -> diagonal matrix operations
 
-ComplexDiagMatrix
+OCTAVE_API ComplexDiagMatrix
 operator * (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b);
 
-ComplexDiagMatrix
+OCTAVE_API ComplexDiagMatrix
 operator * (const ComplexDiagMatrix& a, const DiagMatrix& b);
 
-ComplexDiagMatrix
+OCTAVE_API ComplexDiagMatrix
 operator * (const DiagMatrix& a, const ComplexDiagMatrix& b);
 
 MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, ComplexDiagMatrix, Complex)
--- a/liboctave/CMatrix.h
+++ b/liboctave/CMatrix.h
@@ -132,7 +132,7 @@
   ComplexMatrix transpose (void) const
     { return MArray2<Complex>::transpose (); }
 
-  friend ComplexMatrix conj (const ComplexMatrix& a);
+  friend OCTAVE_API ComplexMatrix conj (const ComplexMatrix& a);
 
   // resize is the destructive equivalent for this one
 
--- a/liboctave/CNDArray.h
+++ b/liboctave/CNDArray.h
@@ -102,7 +102,7 @@
   boolNDArray isinf (void) const;
   boolNDArray isfinite (void) const;
 
-  friend ComplexNDArray conj (const ComplexNDArray& a);
+  friend OCTAVE_API ComplexNDArray conj (const ComplexNDArray& a);
 
   ComplexNDArray fourier (int dim = 1) const;
   ComplexNDArray ifourier (int dim = 1) const;
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,5 +1,29 @@
 2009-05-21  Michael Goffioul  <michael.goffioul@gmail.com>
 
+	* Array-C.cc (class DiagArray2<Complex>::Proxy): Tag with OCTAVE_API.
+	* Array-d.cc (class DiagArray2<double>::Proxy): Ditto.
+	* Array-f.cc (class DiagArray2<float>::Proxy): Ditto.
+	* Array-fC.cc (class DiagArray2<FloatComplex>::Proxy): Ditto.
+	* Array.cc (class octave_sort<T>): Ditto.
+	* CColVector.h (conj, operator*, operator>>, operator<<): Ditto.
+	* CDiagMatrix.h (class ComplexDiagMatrix, conj, operator*): Ditto.
+	* CMatrix.h (conj): Ditto.
+	* CNDArray.h (conj): Ditto.
+	* PermMatrix.h (class PermMatrix, operator*): Ditto.
+	* dDiagMatrix.h (class DiagMatrix): Ditto.
+	* fCColVector.h (conj, operator*, operator>>, operator<<): Ditto.
+	* fCDiagMatrix.h (class FloatComplexDiagMatrix, conj, operator*):
+	Ditto.
+	* fCMatrix.h (conj): Ditto.
+	* fCNDArray.h (conj): Ditto.
+	* fDiagMatrix.h (operator*): Ditto.
+	* oct-locbuf.h (octave_chunk_buffer::octave_chunk_buffer,
+	octave_chunk_buffer::~octave_chunk_buffer): Ditto.
+	* oct-inttypes.cc (octave_int_cmp_op::emulate_op): Ditto.
+	* DET.h (class base_det<T>): Remove OCTAVE_API (cannot be applied on
+	templates).
+	* oct-inttypes.cc (octave_int_cmp_op::emulate_op<class xop>): Ditto.
+
 	* CmplxQR.cc (ComplexQR::insert_col, ComplexQR::delete_col): Copy
 	volatile variable to avoid MSVC compilation error (cannot pass
 	volatile variable as const& argument).
--- a/liboctave/DET.h
+++ b/liboctave/DET.h
@@ -29,7 +29,6 @@
 
 template <class T>
 class
-OCTAVE_API
 base_det
 {
 public:
--- a/liboctave/PermMatrix.h
+++ b/liboctave/PermMatrix.h
@@ -29,7 +29,7 @@
 // Array<T> is inherited privately so that some methods, like index, don't
 // produce unexpected results.
 
-class PermMatrix : protected Array<octave_idx_type>
+class OCTAVE_API PermMatrix : protected Array<octave_idx_type>
 {
 
 public:
@@ -103,7 +103,7 @@
   bool is_col_perm (void) const { return _colp; }
   bool is_row_perm (void) const { return !_colp; }
 
-  friend PermMatrix operator *(const PermMatrix& a, const PermMatrix& b);
+  friend OCTAVE_API PermMatrix operator *(const PermMatrix& a, const PermMatrix& b);
 
   const octave_idx_type *data (void) const 
     { return Array<octave_idx_type>::data (); }
@@ -123,6 +123,7 @@
 
 // Multiplying permutations together.
 PermMatrix 
+OCTAVE_API
 operator *(const PermMatrix& a, const PermMatrix& b);
 
 #endif
--- a/liboctave/dDiagMatrix.h
+++ b/liboctave/dDiagMatrix.h
@@ -118,7 +118,7 @@
 
 // diagonal matrix by diagonal matrix -> diagonal matrix operations
 
-DiagMatrix
+OCTAVE_API DiagMatrix
 operator * (const DiagMatrix& a, const DiagMatrix& b);
 
 MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, DiagMatrix, double)
--- a/liboctave/fCColVector.h
+++ b/liboctave/fCColVector.h
@@ -75,7 +75,7 @@
   FloatComplexRowVector hermitian (void) const;
   FloatComplexRowVector transpose (void) const;
 
-  friend FloatComplexColumnVector conj (const FloatComplexColumnVector& a);
+  friend OCTAVE_API FloatComplexColumnVector conj (const FloatComplexColumnVector& a);
 
   // resize is the destructive equivalent for this one
 
@@ -90,26 +90,26 @@
 
   // matrix by column vector -> column vector operations
 
-  friend FloatComplexColumnVector operator * (const FloatComplexMatrix& a,
+  friend OCTAVE_API FloatComplexColumnVector operator * (const FloatComplexMatrix& a,
 					 const FloatColumnVector& b);
 
-  friend FloatComplexColumnVector operator * (const FloatComplexMatrix& a,
+  friend OCTAVE_API FloatComplexColumnVector operator * (const FloatComplexMatrix& a,
 					 const FloatComplexColumnVector& b);
 
   // matrix by column vector -> column vector operations
 
-  friend FloatComplexColumnVector operator * (const FloatMatrix& a,
+  friend OCTAVE_API FloatComplexColumnVector operator * (const FloatMatrix& a,
 					 const FloatComplexColumnVector& b);
 
   // diagonal matrix by column vector -> column vector operations
 
-  friend FloatComplexColumnVector operator * (const FloatDiagMatrix& a,
+  friend OCTAVE_API FloatComplexColumnVector operator * (const FloatDiagMatrix& a,
 					 const FloatComplexColumnVector& b);
 
-  friend FloatComplexColumnVector operator * (const FloatComplexDiagMatrix& a,
+  friend OCTAVE_API FloatComplexColumnVector operator * (const FloatComplexDiagMatrix& a,
 					 const ColumnVector& b);
 
-  friend FloatComplexColumnVector operator * (const FloatComplexDiagMatrix& a,
+  friend OCTAVE_API FloatComplexColumnVector operator * (const FloatComplexDiagMatrix& a,
 					 const FloatComplexColumnVector& b);
 
   // other operations
@@ -125,8 +125,8 @@
 
   // i/o
 
-  friend std::ostream& operator << (std::ostream& os, const FloatComplexColumnVector& a);
-  friend std::istream& operator >> (std::istream& is, FloatComplexColumnVector& a);
+  friend OCTAVE_API std::ostream& operator << (std::ostream& os, const FloatComplexColumnVector& a);
+  friend OCTAVE_API std::istream& operator >> (std::istream& is, FloatComplexColumnVector& a);
 
 private:
 
--- a/liboctave/fCDiagMatrix.h
+++ b/liboctave/fCDiagMatrix.h
@@ -35,6 +35,7 @@
 #include "mx-defs.h"
 
 class
+OCTAVE_API
 FloatComplexDiagMatrix : public MDiagArray2<FloatComplex>
 {
 public:
@@ -96,7 +97,7 @@
   FloatComplexDiagMatrix transpose (void) const { return MDiagArray2<FloatComplex>::transpose(); }
   FloatDiagMatrix abs (void) const; 
 
-  friend FloatComplexDiagMatrix conj (const FloatComplexDiagMatrix& a);
+  friend OCTAVE_API FloatComplexDiagMatrix conj (const FloatComplexDiagMatrix& a);
 
   // resize is the destructive analog for this one
 
@@ -139,17 +140,17 @@
     : MDiagArray2<FloatComplex> (d, nr, nc) { }
 };
 
-FloatComplexDiagMatrix conj (const FloatComplexDiagMatrix& a);
+OCTAVE_API FloatComplexDiagMatrix conj (const FloatComplexDiagMatrix& a);
 
 // diagonal matrix by diagonal matrix -> diagonal matrix operations
 
-FloatComplexDiagMatrix
+OCTAVE_API FloatComplexDiagMatrix
 operator * (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b);
 
-FloatComplexDiagMatrix
+OCTAVE_API FloatComplexDiagMatrix
 operator * (const FloatComplexDiagMatrix& a, const FloatDiagMatrix& b);
 
-FloatComplexDiagMatrix
+OCTAVE_API FloatComplexDiagMatrix
 operator * (const FloatDiagMatrix& a, const FloatComplexDiagMatrix& b);
 
 MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, FloatComplexDiagMatrix, FloatComplex)
--- a/liboctave/fCMatrix.h
+++ b/liboctave/fCMatrix.h
@@ -132,7 +132,7 @@
   FloatComplexMatrix transpose (void) const
     { return MArray2<FloatComplex>::transpose (); }
 
-  friend FloatComplexMatrix conj (const FloatComplexMatrix& a);
+  friend OCTAVE_API FloatComplexMatrix conj (const FloatComplexMatrix& a);
 
   // resize is the destructive equivalent for this one
 
--- a/liboctave/fCNDArray.h
+++ b/liboctave/fCNDArray.h
@@ -102,7 +102,7 @@
   boolNDArray isinf (void) const;
   boolNDArray isfinite (void) const;
 
-  friend FloatComplexNDArray conj (const FloatComplexNDArray& a);
+  friend OCTAVE_API FloatComplexNDArray conj (const FloatComplexNDArray& a);
 
   FloatComplexNDArray fourier (int dim = 1) const;
   FloatComplexNDArray ifourier (int dim = 1) const;
--- a/liboctave/fDiagMatrix.h
+++ b/liboctave/fDiagMatrix.h
@@ -118,7 +118,7 @@
 
 // diagonal matrix by diagonal matrix -> diagonal matrix operations
 
-FloatDiagMatrix
+OCTAVE_API FloatDiagMatrix
 operator * (const FloatDiagMatrix& a, const FloatDiagMatrix& b);
 
 MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, FloatDiagMatrix, float)
--- a/liboctave/oct-inttypes.cc
+++ b/liboctave/oct-inttypes.cc
@@ -55,7 +55,7 @@
 // Define comparison operators
 
 template <class xop> 
-OCTAVE_API bool 
+bool 
 octave_int_cmp_op::emulate_mop (uint64_t x, double y)
 {
   static const double xxup = std::numeric_limits<uint64_t>::max ();
@@ -75,7 +75,7 @@
 }
 
 template <class xop> 
-OCTAVE_API bool 
+bool 
 octave_int_cmp_op::emulate_mop (int64_t x, double y)
 {
   static const double xxup = std::numeric_limits<int64_t>::max ();
@@ -122,7 +122,7 @@
 DEFINE_REVERTED_OPERATOR(ge,le);
 
 template <class xop> 
-OCTAVE_API bool 
+bool 
 octave_int_cmp_op::emulate_mop (double x, uint64_t y)
 {
   typedef typename rev_op<xop>::op rop;
@@ -130,7 +130,7 @@
 }
 
 template <class xop> 
-OCTAVE_API bool 
+bool 
 octave_int_cmp_op::emulate_mop (double x, int64_t y)
 {
   typedef typename rev_op<xop>::op rop;
@@ -499,7 +499,7 @@
 }
 
 #define INSTANTIATE_INT64_DOUBLE_CMP_OP0(OP,T1,T2) \
-  template bool \
+  template OCTAVE_API bool \
   octave_int_cmp_op::emulate_mop<octave_int_cmp_op::OP> (T1 x, T2 y)
 
 #define INSTANTIATE_INT64_DOUBLE_CMP_OP(OP) \
--- a/liboctave/oct-locbuf.h
+++ b/liboctave/oct-locbuf.h
@@ -69,9 +69,9 @@
 
 public:
 
-  octave_chunk_buffer (size_t size);
+  OCTAVE_API octave_chunk_buffer (size_t size);
 
-  ~octave_chunk_buffer (void);
+  OCTAVE_API ~octave_chunk_buffer (void);
 
   char *data (void) const { return dat; }
 };
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-21  Michael Goffioul  <michael.goffioul@gmail.com>
 
+	* debug.h (class bp_table): Tag with OCTINTERP_API.
+	* input.h (Vdebugging): Ditto.
+	* pt-eval.h (class tree_evaluator): Ditto.
+	* toplev.h (class octave_call_stack): Ditto.
+
 	* file-io.cc (mkstemp): Add mktemp-based implementation of mkstemp on
 	platforms that do not have it (mkstemp is required by the new help
 	system).
--- a/src/debug.h
+++ b/src/debug.h
@@ -33,7 +33,9 @@
 
 // Interface to breakpoints,.
 
-class bp_table
+class
+OCTINTERP_API
+bp_table
 {
 private:
 
--- a/src/input.h
+++ b/src/input.h
@@ -89,7 +89,7 @@
 extern OCTINTERP_API bool Vdrawnow_requested;
 
 // TRUE if we are in debugging mode.
-extern bool Vdebugging;
+extern OCTINTERP_API bool Vdebugging;
 
 extern std::string gnu_readline (const std::string& s, bool force_readline = false);
 
--- a/src/pt-eval.h
+++ b/src/pt-eval.h
@@ -35,6 +35,7 @@
 // How to evaluate the code that the parse trees represent.
 
 class
+OCTINTERP_API
 tree_evaluator : public tree_walker
 {
 public:
--- a/src/toplev.h
+++ b/src/toplev.h
@@ -83,6 +83,7 @@
 extern OCTINTERP_API bool octave_initialized;
 
 class
+OCTINTERP_API
 octave_call_stack
 {
 private: