Changeset 1314
- Timestamp:
- 07/11/24 17:22:23 (3 months ago)
- Location:
- cpp
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/Makefile-SDK
r1242 r1314 9 9 sdk_tests: $(SDK_TESTS) 10 10 11 CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -W error=return-type11 CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -Wno-invalid-offsetof -Werror=return-type 12 12 13 13 SDK_BUILD_CONFIG= -include frams/config/sdk-build-config.h -
cpp/frams/Makefile-SDK-files
r1260 r1314 41 41 NN_LAYOUT_OBJS=frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o 42 42 43 SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/param/paramlist.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/util-string.o common/util-file.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o common/virtfile/stdinoutfilesystem.o $(PRINTFLOAT_OBJS)43 SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/param/paramlist.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/util-string.o common/util-file.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o common/virtfile/stdinoutfilesystem.o common/realloc-free0size.o $(PRINTFLOAT_OBJS) 44 44 45 45 STDOUT_LOGGER_OBJS=common/virtfile/virtfile.o common/loggers/loggertostdout.o common/console.o -
cpp/frams/util/list.h
r793 r1314 1 1 // This file is a part of Framsticks SDK. http://www.framsticks.com/ 2 // Copyright (C) 1999-20 18Maciej Komosinski and Szymon Ulatowski.2 // Copyright (C) 1999-2024 Maciej Komosinski and Szymon Ulatowski. 3 3 // See LICENSE.txt for details. 4 4 … … 9 9 #include <string.h> 10 10 #include <common/nonstd.h> 11 #include <common/realloc-free0size.h> 11 12 12 13 //#define SLISTSTATS … … 44 45 if (mem || x) 45 46 { 46 mem = (T*)realloc (mem, x*sizeof(T));47 mem = (T*)realloc_free0size(mem, x*sizeof(T)); 47 48 #ifdef SLISTSTATS 48 49 SListStats::stats.allocations++; 49 50 SListStats::stats.copied += sizeof(T)*min(x, have); 50 #endif 51 #endif 51 52 } 52 53 have = x; … … 150 151 { 151 152 setSize(src.size()); 152 memcpy(mem, src.mem, src.size()*sizeof(T)); 153 if (mem != NULL) 154 memcpy(mem, src.mem, src.size()*sizeof(T)); 153 155 } 154 156 void operator+=(const SListTempl<T>&src) ///< append src contents -
cpp/frams/util/sstring-simple.cpp
r1280 r1314 3 3 #include <assert.h> 4 4 #include <common/nonstd_math.h> 5 #include <common/realloc-free0size.h> 5 6 6 7 #ifdef __ANDROID__ … … 52 53 { 53 54 if (newsize == allocated) return; 54 txt = (char*)realloc (txt, newsize);55 txt = (char*)realloc_free0size(txt, newsize); 55 56 allocated = newsize; 56 57 }
Note: See TracChangeset
for help on using the changeset viewer.