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

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
Prev Previous commit
Fixed malloc.h include for OSX (patch from @tpaviot)
  • Loading branch information
@davyw
davyw committed Feb 28, 2012
commit 16743b297b34a876fd089e2c30863b3453e7dabf
6 changes: 5 additions & 1 deletion src/base/scl_memmgr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@

#define SCL_MEMMGR_CC
#include "scl_memmgr.h"
#include <malloc.h>
#if __APPLE__
# include <malloc/malloc.h>
#else
# include <malloc.h>
#endif
#include <stdio.h>

#include <string>
Expand Down