COMP/CMSDIST/clhep-2.1.1.0-no-virtual-inline.patch

diff --git a/CLHEP/Matrix/Matrix/DiagMatrix.icc b/CLHEP/Matrix/Matrix/DiagMatrix.icc
index 4173cfa..963a3fe 100755
--- a/CLHEP/Matrix/Matrix/DiagMatrix.icc
+++ b/CLHEP/Matrix/Matrix/DiagMatrix.icc
@@ -12,10 +12,6 @@ inline HepDiagMatrix::HepDiagMatrix()
    : m(0), nrow(0)
 {}
 
-inline int HepDiagMatrix::num_row() const { return nrow;}
-inline int HepDiagMatrix::num_col() const  { return nrow;}
-inline int HepDiagMatrix::num_size() const  { return nrow;}
-
 inline double & HepDiagMatrix::fast(int row,int col)
 {
 #ifdef MATRIX_BOUND_CHECK
@@ -47,16 +43,6 @@ inline const double & HepDiagMatrix::fast(int row,int col) const
   }
 }
 
-inline double & HepDiagMatrix::operator()(int row, int col)
-{
-   return fast(col,row);
-}
-
-inline const double & HepDiagMatrix::operator()(int row, int col) const 
-{ 
-   return fast(col,row);
-}
-
 inline void HepDiagMatrix::assign(const HepDiagMatrix &m2) {(*this)=m2;}
 
 inline HepDiagMatrix HepDiagMatrix::T() const {return HepDiagMatrix(*this);}
diff --git a/CLHEP/Matrix/Matrix/GenMatrix.h b/CLHEP/Matrix/Matrix/GenMatrix.h
index 247d8f6..cf846e3 100755
--- a/CLHEP/Matrix/Matrix/GenMatrix.h
+++ b/CLHEP/Matrix/Matrix/GenMatrix.h
@@ -36,7 +36,7 @@ class HepGenMatrix;
 class HepGenMatrix {
  
 public:
-   virtual ~HepGenMatrix() {}
+   virtual ~HepGenMatrix();
 
 
 #ifdef DISABLE_ALLOC   // disable this non-compliant allocator
diff --git a/CLHEP/Matrix/Matrix/SymMatrix.h b/CLHEP/Matrix/Matrix/SymMatrix.h
index 7ef8b00..72a8c87 100755
--- a/CLHEP/Matrix/Matrix/SymMatrix.h
+++ b/CLHEP/Matrix/Matrix/SymMatrix.h
@@ -109,8 +109,8 @@ public:
    virtual ~HepSymMatrix();
    // Destructor.
 
-   inline int num_row() const;
-   inline int num_col() const;
+   int num_row() const;
+   int num_col() const;
    // Returns number of rows/columns.
 
    const double & operator()(int row, int col) const; 
diff --git a/CLHEP/Matrix/Matrix/SymMatrix.icc b/CLHEP/Matrix/Matrix/SymMatrix.icc
index ae748e1..0935072 100755
--- a/CLHEP/Matrix/Matrix/SymMatrix.icc
+++ b/CLHEP/Matrix/Matrix/SymMatrix.icc
@@ -13,10 +13,6 @@ inline HepSymMatrix::HepSymMatrix()
   : m(0), nrow(0), size_(0)
 {}
 
-inline int HepSymMatrix::num_row() const { return nrow;}
-inline int HepSymMatrix::num_col() const  { return nrow;}
-inline int HepSymMatrix::num_size() const  { return size_;}
-
 inline double & HepSymMatrix::fast(int row,int col)
 {
 #ifdef MATRIX_BOUND_CHECK
@@ -34,11 +30,6 @@ inline const double & HepSymMatrix::fast(int row,int col) const
   return *(m.begin()+(row*(row-1))/2+(col-1));
 }
 
-inline double & HepSymMatrix::operator()(int row, int col)
-    {return (row>=col? fast(row,col) : fast(col,row));}
-inline const double & HepSymMatrix::operator()(int row, int col) const 
-    {return (row>=col? fast(row,col) : fast(col,row));}
-
 inline void HepSymMatrix::assign(const HepSymMatrix &m2) 
   {(*this)=m2;}
 
diff --git a/CLHEP/Matrix/src/DiagMatrix.cc b/CLHEP/Matrix/src/DiagMatrix.cc
index 196e645..745d983 100755
--- a/CLHEP/Matrix/src/DiagMatrix.cc
+++ b/CLHEP/Matrix/src/DiagMatrix.cc
@@ -24,6 +24,20 @@
 
 namespace CLHEP {
 
+int HepDiagMatrix::num_row() const { return nrow;}
+int HepDiagMatrix::num_col() const  { return nrow;}
+int HepDiagMatrix::num_size() const  { return nrow;}
+
+double & HepDiagMatrix::operator()(int row, int col)
+{
+   return fast(col,row);
+}
+
+const double & HepDiagMatrix::operator()(int row, int col) const 
+{ 
+   return fast(col,row);
+}
+
 // Simple operation for all elements
 
 #define SIMPLE_UOP(OPER)          \
diff --git a/CLHEP/Matrix/src/GenMatrix.cc b/CLHEP/Matrix/src/GenMatrix.cc
index 5902f0c..6390e86 100755
--- a/CLHEP/Matrix/src/GenMatrix.cc
+++ b/CLHEP/Matrix/src/GenMatrix.cc
@@ -25,6 +25,9 @@
 
 namespace CLHEP {
 
+HepGenMatrix::~HepGenMatrix()
+{}
+
 #ifdef HEP_THIS_FUNCTION_IS_NOT_NEEDED
 static void delete_array(double *m)
 {
diff --git a/CLHEP/Matrix/src/SymMatrix.cc b/CLHEP/Matrix/src/SymMatrix.cc
index 8dd79ec..2629d0e 100755
--- a/CLHEP/Matrix/src/SymMatrix.cc
+++ b/CLHEP/Matrix/src/SymMatrix.cc
@@ -24,6 +24,15 @@
 
 namespace CLHEP {
 
+int HepSymMatrix::num_row() const { return nrow;}
+int HepSymMatrix::num_col() const  { return nrow;}
+int HepSymMatrix::num_size() const  { return size_;}
+
+double & HepSymMatrix::operator()(int row, int col)
+    {return (row>=col? fast(row,col) : fast(col,row));}
+const double & HepSymMatrix::operator()(int row, int col) const 
+    {return (row>=col? fast(row,col) : fast(col,row));}
+
 // Simple operation for all elements
 
 #define SIMPLE_UOP(OPER)          \
#	User	Rev	Content
1	davidlt	1.1	diff --git a/CLHEP/Matrix/Matrix/DiagMatrix.icc b/CLHEP/Matrix/Matrix/DiagMatrix.icc
2			index 4173cfa..963a3fe 100755
3			--- a/CLHEP/Matrix/Matrix/DiagMatrix.icc
4			+++ b/CLHEP/Matrix/Matrix/DiagMatrix.icc
5			@@ -12,10 +12,6 @@ inline HepDiagMatrix::HepDiagMatrix()
6			: m(0), nrow(0)
7			{}
8
9			-inline int HepDiagMatrix::num_row() const { return nrow;}
10			-inline int HepDiagMatrix::num_col() const { return nrow;}
11			-inline int HepDiagMatrix::num_size() const { return nrow;}
12			-
13			inline double & HepDiagMatrix::fast(int row,int col)
14			{
15			#ifdef MATRIX_BOUND_CHECK
16			@@ -47,16 +43,6 @@ inline const double & HepDiagMatrix::fast(int row,int col) const
17			}
18			}
19
20			-inline double & HepDiagMatrix::operator()(int row, int col)
21			-{
22			- return fast(col,row);
23			-}
24			-
25			-inline const double & HepDiagMatrix::operator()(int row, int col) const
26			-{
27			- return fast(col,row);
28			-}
29			-
30			inline void HepDiagMatrix::assign(const HepDiagMatrix &m2) {(*this)=m2;}
31
32			inline HepDiagMatrix HepDiagMatrix::T() const {return HepDiagMatrix(*this);}
33			diff --git a/CLHEP/Matrix/Matrix/GenMatrix.h b/CLHEP/Matrix/Matrix/GenMatrix.h
34			index 247d8f6..cf846e3 100755
35			--- a/CLHEP/Matrix/Matrix/GenMatrix.h
36			+++ b/CLHEP/Matrix/Matrix/GenMatrix.h
37			@@ -36,7 +36,7 @@ class HepGenMatrix;
38			class HepGenMatrix {
39
40			public:
41			- virtual ~HepGenMatrix() {}
42			+ virtual ~HepGenMatrix();
43
44
45			#ifdef DISABLE_ALLOC // disable this non-compliant allocator
46			diff --git a/CLHEP/Matrix/Matrix/SymMatrix.h b/CLHEP/Matrix/Matrix/SymMatrix.h
47			index 7ef8b00..72a8c87 100755
48			--- a/CLHEP/Matrix/Matrix/SymMatrix.h
49			+++ b/CLHEP/Matrix/Matrix/SymMatrix.h
50			@@ -109,8 +109,8 @@ public:
51			virtual ~HepSymMatrix();
52			// Destructor.
53
54			- inline int num_row() const;
55			- inline int num_col() const;
56			+ int num_row() const;
57			+ int num_col() const;
58			// Returns number of rows/columns.
59
60			const double & operator()(int row, int col) const;
61			diff --git a/CLHEP/Matrix/Matrix/SymMatrix.icc b/CLHEP/Matrix/Matrix/SymMatrix.icc
62			index ae748e1..0935072 100755
63			--- a/CLHEP/Matrix/Matrix/SymMatrix.icc
64			+++ b/CLHEP/Matrix/Matrix/SymMatrix.icc
65			@@ -13,10 +13,6 @@ inline HepSymMatrix::HepSymMatrix()
66			: m(0), nrow(0), size_(0)
67			{}
68
69			-inline int HepSymMatrix::num_row() const { return nrow;}
70			-inline int HepSymMatrix::num_col() const { return nrow;}
71			-inline int HepSymMatrix::num_size() const { return size_;}
72			-
73			inline double & HepSymMatrix::fast(int row,int col)
74			{
75			#ifdef MATRIX_BOUND_CHECK
76			@@ -34,11 +30,6 @@ inline const double & HepSymMatrix::fast(int row,int col) const
77			return (m.begin()+(row(row-1))/2+(col-1));
78			}
79
80			-inline double & HepSymMatrix::operator()(int row, int col)
81			- {return (row>=col? fast(row,col) : fast(col,row));}
82			-inline const double & HepSymMatrix::operator()(int row, int col) const
83			- {return (row>=col? fast(row,col) : fast(col,row));}
84			-
85			inline void HepSymMatrix::assign(const HepSymMatrix &m2)
86			{(*this)=m2;}
87
88			diff --git a/CLHEP/Matrix/src/DiagMatrix.cc b/CLHEP/Matrix/src/DiagMatrix.cc
89			index 196e645..745d983 100755
90			--- a/CLHEP/Matrix/src/DiagMatrix.cc
91			+++ b/CLHEP/Matrix/src/DiagMatrix.cc
92			@@ -24,6 +24,20 @@
93
94			namespace CLHEP {
95
96	davidlt	1.2	+int HepDiagMatrix::num_row() const { return nrow;}
97			+int HepDiagMatrix::num_col() const { return nrow;}
98			+int HepDiagMatrix::num_size() const { return nrow;}
99	davidlt	1.1	+
100	davidlt	1.2	+double & HepDiagMatrix::operator()(int row, int col)
101	davidlt	1.1	+{
102			+ return fast(col,row);
103			+}
104			+
105	davidlt	1.2	+const double & HepDiagMatrix::operator()(int row, int col) const
106	davidlt	1.1	+{
107			+ return fast(col,row);
108			+}
109			+
110			// Simple operation for all elements
111
112			#define SIMPLE_UOP(OPER) \
113			diff --git a/CLHEP/Matrix/src/GenMatrix.cc b/CLHEP/Matrix/src/GenMatrix.cc
114			index 5902f0c..6390e86 100755
115			--- a/CLHEP/Matrix/src/GenMatrix.cc
116			+++ b/CLHEP/Matrix/src/GenMatrix.cc
117			@@ -25,6 +25,9 @@
118
119			namespace CLHEP {
120
121			+HepGenMatrix::~HepGenMatrix()
122			+{}
123			+
124			#ifdef HEP_THIS_FUNCTION_IS_NOT_NEEDED
125			static void delete_array(double *m)
126			{
127			diff --git a/CLHEP/Matrix/src/SymMatrix.cc b/CLHEP/Matrix/src/SymMatrix.cc
128			index 8dd79ec..2629d0e 100755
129			--- a/CLHEP/Matrix/src/SymMatrix.cc
130			+++ b/CLHEP/Matrix/src/SymMatrix.cc
131			@@ -24,6 +24,15 @@
132
133			namespace CLHEP {
134
135	davidlt	1.2	+int HepSymMatrix::num_row() const { return nrow;}
136			+int HepSymMatrix::num_col() const { return nrow;}
137			+int HepSymMatrix::num_size() const { return size_;}
138	davidlt	1.1	+
139	davidlt	1.2	+double & HepSymMatrix::operator()(int row, int col)
140	davidlt	1.1	+ {return (row>=col? fast(row,col) : fast(col,row));}
141	davidlt	1.2	+const double & HepSymMatrix::operator()(int row, int col) const
142	davidlt	1.1	+ {return (row>=col? fast(row,col) : fast(col,row));}
143			+
144			// Simple operation for all elements
145
146			#define SIMPLE_UOP(OPER) \