Changeset 9434 in ntrip for trunk/BNC/newmat/newmat6.cpp

Timestamp:

May 19, 2021, 1:32:38 PM (3 years ago)

Author:

stuerze

Message:

newmat is reverted to its stable version 10 because version 11beta was not working with mac compilers

File:

• trunk/BNC/newmat/newmat6.cpp (modified) (2 diffs)

trunk/BNC/newmat/newmat6.cpp

@@ -495 +495 @@
    Tracer tr("GeneralMatrix::operator+=");
    // MatrixConversionCheck mcc;
-   Protect();  // so it cannot get deleted during Evaluate
+   Protect();                                   // so it cannot get deleted
+                                                // during Evaluate
    GeneralMatrix* gm = ((BaseMatrix&)X).Evaluate();
    AddedMatrix am(this,gm);
    if (gm==this) Release(2); else Release();
    Eq2(am,type());
-}
-
-// GeneralMatrix operators
-
-void GeneralMatrix::SP_eq(const BaseMatrix& X)
-{
-   REPORT
-   Tracer tr("GeneralMatrix::SP_eq");
-   // MatrixConversionCheck mcc;
-   Protect();  // so it cannot get deleted during Evaluate
-   GeneralMatrix* gm = ((BaseMatrix&)X).Evaluate();
-   SPMatrix spm(this,gm);
-   if (gm==this) Release(2); else Release();
-   Eq2(spm,type());
 }
 
@@ -599 +586 @@
    if (gmx==gm) gm->Release(2); else gm->Release();
    GeneralMatrix* gmy = am.Evaluate();
-   if (gmy != gm) { REPORT delete gm; gm = gmy->Image(); }
-   else { REPORT }
-   gm->Protect();
-}
-
-void GenericMatrix::SP_eq(const BaseMatrix& X)
-{
-   REPORT
-   Tracer tr("GenericMatrix::SP_eq");
-   if (!gm) Throw(ProgramException("GenericMatrix is null"));
-   gm->Protect();            // so it cannot get deleted during Evaluate
-   GeneralMatrix* gmx = ((BaseMatrix&)X).Evaluate();
-   SPMatrix spm(gm,gmx);
-   if (gmx==gm) gm->Release(2); else gm->Release();
-   GeneralMatrix* gmy = spm.Evaluate();
    if (gmy != gm) { REPORT delete gm; gm = gmy->Image(); }
    else { REPORT }