Skip to content

Review/scl memmgr #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpictor merged 6 commits into from
Mar 1, 2012
Merged

Review/scl memmgr #148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82c84e7
Added base library with scl_memmgr implementation.
davyw Feb 27, 2012
4d6d249
Added use of scl_memmgr to express library.
davyw Feb 27, 2012
7ce8bcb
Added use of scl_memmgr to exppp library.
davyw Feb 27, 2012
4e0d73d
Added use of scl_memmgr to fedex_plus application.
davyw Feb 27, 2012
7ec9f7d
Fixed fedex_python issues for msvc build.
davyw Feb 27, 2012
16743b2
Fixed malloc.h include for OSX (patch from @tpaviot)
davyw Feb 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added base library with scl_memmgr implementation. 
* scl_memmgr supports both c and c++ memory management.
  malloc, calloc, realloc and free for c.
  new, delete operators for c++.
  (in c++ files scl_memmgr.h should be included last because a macro
   is used to replace new and delete with scl versions. If not included
   last, this would break build.)
  • Loading branch information
@davyw
davyw committed Feb 27, 2012
commit 82c84e7337cae37be65fe1653007498e76f5bc61
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ include_directories(
${SCL_BINARY_DIR}/include
)

ADD_SUBDIRECTORY(src/base)
ADD_SUBDIRECTORY(src/express)
ADD_SUBDIRECTORY(src/exppp)
ADD_SUBDIRECTORY(src/fedex_plus)
Expand Down
13 changes: 13 additions & 0 deletions include/scl_export.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
#ifndef SCL_EXPORT_H
#define SCL_EXPORT_H

/* Import/Export flags for base. */
#ifndef SCL_BASE_EXPORT
# if defined(SCL_BASE_DLL_EXPORTS) && defined(SCL_BASE_DLL_IMPORTS)
# error "Only SCL_BASE_DLL_EXPORTS or SCL_BASE_DLL_IMPORTS can be defined, not both."
# elif defined(SCL_BASE_DLL_EXPORTS)
# define SCL_BASE_EXPORT __declspec(dllexport)
# elif defined(SCL_BASE_DLL_IMPORTS)
# define SCL_BASE_EXPORT __declspec(dllimport)
# else
# define SCL_BASE_EXPORT
# endif
#endif

/* Import/Export flags for express. */
#ifndef SCL_EXPRESS_EXPORT
# if defined(SCL_EXPRESS_DLL_EXPORTS) && defined(SCL_EXPRESS_DLL_IMPORTS)
Expand Down
20 changes: 20 additions & 0 deletions src/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

set(SCL_BASE_SOURCES
scl_memmgr.cc
)

include_directories(
${SCL_SOURCE_DIR}/include
)

option(SCL_MEMMGR_ENABLE_CHECKS "Enable scl_memmgr's memory leak detection" OFF)

if(MSVC OR BORLAND)
add_definitions( -DSCL_BASE_DLL_EXPORTS )
endif()

if (${SCL_MEMMGR_ENABLE_CHECKS})
add_definitions( -DSCL_MEMMGR_ENABLE_CHECKS )
endif()

SCL_ADDLIB(base "${SCL_BASE_SOURCES}" "")
Loading