← Back to branch summary

~canonical-dx-team/nux/nux.fix-702538

« back to all changes in this revision

Viewing changes to NuxCore/Memory.cpp

  • Committer: Jay Taoko
  • Date: 2010-12-14 02:44:53 UTC
  • mfrom: (156.1.2 nux.remove-exit)
  • Revision ID: jay.taoko@canonical.com-20101214024453-oympev32gk3j8wzn
* Removed exit calls
* Added options to unity_support_test
* Added usage file for unity_support_test
* Cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxCore/Memory.cpp
87
87
  void *Realloc (void *Original, t_size Count, t_u32 Alignment)
88
88
  {
89
89
    void *mem = std::realloc ( Original, Count );
90
 
    nuxAssertMsg (mem, TEXT ("[inlRealloc] realloc failed.") );
91
90
 
92
91
    if (mem == 0)
93
 
      std::exit (0);
 
92
    {
 
93
      nuxCriticalMsg (TEXT ("[Realloc] realloc failed."));
 
94
      return NULL;
 
95
    }
94
96
 
95
97
    return mem;
96
98
  }