Merge branch 'majestic' of github.com:GrammaticalFramework/gf-core into majestic

This commit is contained in:
krangelov
2021-10-12 12:07:17 +02:00
3 changed files with 5 additions and 3 deletions

View File

@@ -29,7 +29,7 @@ libpgf_la_SOURCES = \
libpgf_la_LDFLAGS = -no-undefined
libpgf_la_LIBADD = -lrt
libpgf_la_CXXFLAGS = -fno-rtti
libpgf_la_CXXFLAGS = -fno-rtti -std=c++11
bin_PROGRAMS =

View File

@@ -2,6 +2,8 @@
#include <sys/mman.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <pthread.h>
#include "data.h"

View File

@@ -112,6 +112,6 @@ private:
DB_scope* next_scope;
};
extern PGF_INTERNAL_DECL thread_local DB_scope *last_db_scope __attribute__((tls_model("initial-exec")));
extern PGF_INTERNAL_DECL __thread DB_scope *last_db_scope __attribute__((tls_model("initial-exec")));
#endif