Nux

Merge lp:~hikiko/nux/nux.fix-debug-calls into lp:nux

  1. nux.fix-debug-calls
  2. Merge into trunk
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 851
Merged at revision: 851
Proposed branch: lp:~hikiko/nux/nux.fix-debug-calls
Merge into: lp:nux
Diff against target: 79 lines (+6/-19)
2 files modified
INSTALL (+6/-6)
NuxCore/Object.cpp (+0/-13)
To merge this branch: bzr merge lp:~hikiko/nux/nux.fix-debug-calls
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Unity Team Pending
Review via email: mp+230127@code.launchpad.net

Commit message

Minor change that fixes compile errors in the debug build.

Description of the change

Minor change that fixes compile errors in the debug build.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2012-10-18 08:31:24 +0000
3+++ INSTALL 2014-08-08 14:57:58 +0000
4@@ -1,7 +1,7 @@
5 Installation Instructions
6 *************************
7
8-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
9+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
10 Inc.
11
12 Copying and distribution of this file, with or without modification,
13@@ -12,8 +12,8 @@
14 Basic Installation
15 ==================
16
17- Briefly, the shell commands `./configure; make; make install' should
18-configure, build, and install this package. The following
19+ Briefly, the shell command `./configure && make && make install'
20+should configure, build, and install this package. The following
21 more-detailed instructions are generic; see the `README' file for
22 instructions specific to this package. Some packages provide this
23 `INSTALL' file but do not implement all of the features documented
24@@ -309,9 +309,10 @@
25 overridden in the site shell script).
26
27 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
28-an Autoconf bug. Until the bug is fixed you can use this workaround:
29+an Autoconf limitation. Until the limitation is lifted, you can use
30+this workaround:
31
32- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
33+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
34
35 `configure' Invocation
36 ======================
37@@ -367,4 +368,3 @@
38
39 `configure' also accepts some other, not widely useful, options. Run
40 `configure --help' for more details.
41-
42
43=== modified file 'NuxCore/Object.cpp'
44--- NuxCore/Object.cpp 2014-07-30 00:23:32 +0000
45+++ NuxCore/Object.cpp 2014-08-08 14:57:58 +0000
46@@ -62,10 +62,6 @@
47 sout << "\t" << ++index << " Undeleted object: Type "
48 << obj->GetTypeName() << ", "
49 << obj->GetAllocationLocation() << "\n";
50- if (debug_object_allocation_stack())
51- {
52- sout << obj->allocation_stacktrace_ << "\n\n";
53- }
54
55 OutputDebugString(sout.str().c_str());
56
57@@ -78,10 +74,6 @@
58 std::cerr << "\t" << ++index << " Undeleted object: Type "
59 << obj->GetTypeName() << ", "
60 << obj->GetAllocationLocation() << "\n";
61- if (debug_object_allocation_stack())
62- {
63- std::cerr << obj->allocation_stacktrace_ << "\n\n";
64- }
65 }
66 #endif
67 #endif
68@@ -249,11 +241,6 @@
69 sout << ":" << __Nux_LineNumber__;
70 allocation_location_ = sout.str();
71
72- #if defined(NUX_OS_LINUX)
73- if (debug_object_allocation_stack()) {
74- allocation_stacktrace_ = logging::Backtrace();
75- }
76- #endif
77 #else
78 __Nux_FileName__ = __Nux_FileName__;
79 __Nux_LineNumber__ = __Nux_LineNumber__;

Subscribers

People subscribed via source and target branches