X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2Fmemoire.h;h=ef953601fd8e7e51376ec621764f860dd98fb7d9;hp=fe08e6124cb7136b5c13705d7a4029eeabd99e05;hb=21af9b3a2c317f5693f228cd8ed55c2bb44b0a07;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5;ds=sidebyside

diff --git a/src/SMESH/memoire.h b/src/SMESH/memoire.h
index fe08e6124..ef953601f 100644
--- a/src/SMESH/memoire.h
+++ b/src/SMESH/memoire.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,24 +20,32 @@
 #ifndef _MEMOIRE_H_
 #define _MEMOIRE_H_
 
+#ifdef __APPLE__
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 #include <iostream>
 
 void memostat(const char* f, int l);
 
 void memostat(const char* f, int l)
 {
-#ifdef WIN32
+#if defined WIN32 || defined __APPLE__
         //rnv: TODO: find alternative of the malloc_stats() on windows platform
 #else
-  /*  struct mallinfo mem = mallinfo(); */
-  /*  std::cerr << f << ":"<< l << " " << mem.arena << " " << mem.ordblks << " " << mem.hblks << " " << mem.hblkhd << " "  << mem.uordblks << " "  << mem.fordblks << " " << mem.keepcost << std::endl; */
+  struct mallinfo mem = mallinfo();
+  std::cerr << f << ":"<< l << " " << mem.arena << " " << mem.ordblks << " " << mem.hblks << " " << mem.hblkhd << " "  << mem.uordblks << " "  << mem.fordblks << " " << mem.keepcost << std::endl;
   std::cerr << f << ":" << l << " --------------------------" << std::endl;
   malloc_stats();
   std::cerr << f << ":" << l << " --------------------------" << std::endl;
 #endif
 }
 
+#if defined(_DEBUG_) || defined(_DEBUG)
 #define MEMOSTAT //memostat( __FILE__, __LINE__ )
+#else
+#define MEMOSTAT
+#endif
 
 #endif