Merge branch 'develop' into 'main'

New GDX release 7.11.9

See merge request devel/gdx!85

changelog.yaml

@@ -1,4 +1,7 @@
 ---
+- 7.11.9:
+    - Made gdxOpenRead not lock the file (from being deleted) on Windows.
+    - Removed unnecessary dependency on "dladdr" as requested in GitHub issue.
 - 7.11.8:
     - Added C++ port of GDX utilities gdxdiff, gdxdump, and gdxmerge.
 - 7.11.7:

src/gdlib/gmacro.cpp

@@ -331,6 +331,8 @@ bool TGAMSMacro::Define( const std::string &p, int &LUsed )
    }
    Body.clear();
    LUsed = static_cast<int>( p.length() );
+   // fake trailing blank
+   Rdr.pr.push_back( ' ' );
    return AddToBody( Rdr.pr );
 }
 
@@ -342,8 +344,9 @@ bool TGAMSMacro::AddToBody( const std::string &p )
 
    TPWriter Wrt;
    Wrt.StoreStr( Body );
-   const auto L = static_cast<int>( p.length() );
-   const TPReader Rdr { p };
+   //no trailing blank
+   const auto L = static_cast<int>( p.length() ) - 1;
+   const TPReader Rdr { p.substr(0, L) };
    const bool res { Rdr.ChFromEnd( 0 ) == '\\' };
    if( !res ) Wrt.StoreTrimStr( p );
    else

src/gdlib/gmsheapnew.h

@@ -139,6 +139,13 @@ class THeapMgr final
       return new(XGetMem<T>()) T {};
    }
 
+   // Use perfect forwarding for arguments to T's constructor
+   template<typename T, typename... Args>
+   inline T *XGetMemCreat( Args &&...args )
+   {
+      return new( XGetMem<T>() ) T( std::forward<Args>( args )... );
+   }
+
    void *XGetMemNC( int Size );
    void *XAllocMem( int Size );
 

src/gdlib/nlcodebase.cpp

@@ -0,0 +1,4 @@
+#include "nlcodebase.h"
+
+namespace gdlib::nlcodebase {
+}

src/gdlib/nlcodebase.h

@@ -0,0 +1,10 @@
+#pragma once
+
+namespace gdlib::nlcodebase {
+
+class TNLInstStoreBase {
+public:
+   bool NLCodeEmitted {};
+};
+
+}