merged c++ libraries to c libraries. (e.g. libqsecmnxx merged in libqsecmn)

implemented the feed-based sttp class
This commit is contained in:
2020-08-06 11:42:39 +00:00
parent 85447c8882
commit 1cbdbed159
34 changed files with 1196 additions and 1128 deletions

View File

@ -124,13 +124,14 @@ libqsecmn_la_LIBADD = $(SOCKET_LIBS) $(QUADMATH_LIBS)
if ENABLE_CXX
lib_LTLIBRARIES += libqsecmnxx.la
libqsecmnxx_la_SOURCES = \
ErrorGrab.cpp Mmgr.cpp StdMmgr.cpp HeapMmgr.cpp Mmged.cpp Mpool.cpp String.cpp
libqsecmnxx_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libqsecmnxx_la_LIBADD = -lqsecmn
libqsecmnxx_la_DEPENDENCIES = libqsecmn.la
libqsecmn_la_SOURCES += \
ErrorGrab.cpp \
Mmgr.cpp \
StdMmgr.cpp \
HeapMmgr.cpp \
Mmged.cpp \
Mpool.cpp \
String.cpp
endif

View File

@ -91,8 +91,15 @@ build_triplet = @build@
host_triplet = @host@
@ENABLE_BUNDLED_UNICODE_TRUE@am__append_1 = uni.c
@ENABLE_XCMGRS_TRUE@am__append_2 = cp949.c cp950.c
@ENABLE_CXX_TRUE@am__append_3 = libqsecmnxx.la
@ENABLE_CXX_FALSE@libqsecmnxx_la_DEPENDENCIES =
@ENABLE_CXX_TRUE@am__append_3 = \
@ENABLE_CXX_TRUE@ ErrorGrab.cpp \
@ENABLE_CXX_TRUE@ Mmgr.cpp \
@ENABLE_CXX_TRUE@ StdMmgr.cpp \
@ENABLE_CXX_TRUE@ HeapMmgr.cpp \
@ENABLE_CXX_TRUE@ Mmged.cpp \
@ENABLE_CXX_TRUE@ Mpool.cpp \
@ENABLE_CXX_TRUE@ String.cpp
subdir = lib/cmn
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
@ -154,9 +161,13 @@ am__libqsecmn_la_SOURCES_DIST = alg-base64.c alg-rand.c alg-search.c \
str-set.c str-spl.c str-spn.c str-str.c str-subst.c str-tok.c \
str-trm.c str-type.c str-word.c time.c tmr.c tre.c tre-ast.c \
tre-compile.c tre-match-bt.c tre-match-pa.c tre-parse.c \
tre-stack.c uri.c utf8.c xma.c uni.c cp949.c cp950.c
tre-stack.c uri.c utf8.c xma.c uni.c cp949.c cp950.c \
ErrorGrab.cpp Mmgr.cpp StdMmgr.cpp HeapMmgr.cpp Mmged.cpp \
Mpool.cpp String.cpp
@ENABLE_BUNDLED_UNICODE_TRUE@am__objects_1 = uni.lo
@ENABLE_XCMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo
@ENABLE_CXX_TRUE@am__objects_3 = ErrorGrab.lo Mmgr.lo StdMmgr.lo \
@ENABLE_CXX_TRUE@ HeapMmgr.lo Mmged.lo Mpool.lo String.lo
am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \
alg-sort.lo arr.lo assert.lo chr.lo dll.lo env.lo gdl.lo \
htb.lo htl.lo fma.lo fmt-intmax.lo fmt-out.lo hton.lo hwad.lo \
@ -171,26 +182,16 @@ am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \
str-subst.lo str-tok.lo str-trm.lo str-type.lo str-word.lo \
time.lo tmr.lo tre.lo tre-ast.lo tre-compile.lo \
tre-match-bt.lo tre-match-pa.lo tre-parse.lo tre-stack.lo \
uri.lo utf8.lo xma.lo $(am__objects_1) $(am__objects_2)
uri.lo utf8.lo xma.lo $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
libqsecmn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libqsecmn_la_LDFLAGS) $(LDFLAGS) -o $@
am__libqsecmnxx_la_SOURCES_DIST = ErrorGrab.cpp Mmgr.cpp StdMmgr.cpp \
HeapMmgr.cpp Mmged.cpp Mpool.cpp String.cpp
@ENABLE_CXX_TRUE@am_libqsecmnxx_la_OBJECTS = ErrorGrab.lo Mmgr.lo \
@ENABLE_CXX_TRUE@ StdMmgr.lo HeapMmgr.lo Mmged.lo Mpool.lo \
@ENABLE_CXX_TRUE@ String.lo
libqsecmnxx_la_OBJECTS = $(am_libqsecmnxx_la_OBJECTS)
libqsecmnxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(libqsecmnxx_la_LDFLAGS) \
$(LDFLAGS) -o $@
@ENABLE_CXX_TRUE@am_libqsecmnxx_la_rpath = -rpath $(libdir)
libqsecmn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libqsecmn_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@ -285,9 +286,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = $(libqsecmn_la_SOURCES) $(libqsecmnxx_la_SOURCES)
DIST_SOURCES = $(am__libqsecmn_la_SOURCES_DIST) \
$(am__libqsecmnxx_la_SOURCES_DIST)
SOURCES = $(libqsecmn_la_SOURCES)
DIST_SOURCES = $(am__libqsecmn_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@ -485,7 +485,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include
lib_LTLIBRARIES = libqsecmn.la $(am__append_3)
lib_LTLIBRARIES = libqsecmn.la
noinst_HEADERS = \
cp949.h \
cp950.h \
@ -523,15 +523,10 @@ libqsecmn_la_SOURCES = alg-base64.c alg-rand.c alg-search.c alg-sort.c \
str-set.c str-spl.c str-spn.c str-str.c str-subst.c str-tok.c \
str-trm.c str-type.c str-word.c time.c tmr.c tre.c tre-ast.c \
tre-compile.c tre-match-bt.c tre-match-pa.c tre-parse.c \
tre-stack.c uri.c utf8.c xma.c $(am__append_1) $(am__append_2)
tre-stack.c uri.c utf8.c xma.c $(am__append_1) $(am__append_2) \
$(am__append_3)
libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libqsecmn_la_LIBADD = $(SOCKET_LIBS) $(QUADMATH_LIBS)
@ENABLE_CXX_TRUE@libqsecmnxx_la_SOURCES = \
@ENABLE_CXX_TRUE@ ErrorGrab.cpp Mmgr.cpp StdMmgr.cpp HeapMmgr.cpp Mmged.cpp Mpool.cpp String.cpp
@ENABLE_CXX_TRUE@libqsecmnxx_la_LDFLAGS = -version-info 1:0:0 -no-undefined
@ENABLE_CXX_TRUE@libqsecmnxx_la_LIBADD = -lqsecmn
@ENABLE_CXX_TRUE@libqsecmnxx_la_DEPENDENCIES = libqsecmn.la
all: all-am
.SUFFIXES:
@ -602,10 +597,7 @@ clean-libLTLIBRARIES:
}
libqsecmn.la: $(libqsecmn_la_OBJECTS) $(libqsecmn_la_DEPENDENCIES) $(EXTRA_libqsecmn_la_DEPENDENCIES)
$(AM_V_CCLD)$(libqsecmn_la_LINK) -rpath $(libdir) $(libqsecmn_la_OBJECTS) $(libqsecmn_la_LIBADD) $(LIBS)
libqsecmnxx.la: $(libqsecmnxx_la_OBJECTS) $(libqsecmnxx_la_DEPENDENCIES) $(EXTRA_libqsecmnxx_la_DEPENDENCIES)
$(AM_V_CXXLD)$(libqsecmnxx_la_LINK) $(am_libqsecmnxx_la_rpath) $(libqsecmnxx_la_OBJECTS) $(libqsecmnxx_la_LIBADD) $(LIBS)
$(AM_V_CXXLD)$(libqsecmn_la_LINK) -rpath $(libdir) $(libqsecmn_la_OBJECTS) $(libqsecmn_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)

View File

@ -50,7 +50,7 @@ void Mmgr::free_mem (mmgr_t* mmgr, void* ptr) QSE_CPP_NOEXCEPT
void* Mmgr::callocate (qse_size_t n, bool raise_exception) /*QSE_CPP_THREXCEPT1(MemoryError)*/
{
void* ptr = this->allocate(n, raise_exception);
QSE_MEMSET (ptr, 0, n);
if (ptr) QSE_MEMSET (ptr, 0, n);
return ptr;
}