mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Added calling convention to logAssertion.

Browse source
This commit is contained in:
jules 2013-04-04 11:41:47 +01:00
parent 5ee819e739
commit deb02fdf70
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_core/logging/juce_Logger.cpp
View file

@ -46,7 +46,7 @@ void Logger::writeToLog (const String& message)
} }
#if JUCE_LOG_ASSERTIONS || JUCE_DEBUG #if JUCE_LOG_ASSERTIONS || JUCE_DEBUG
void JUCE_API logAssertion (const char* const filename, const int lineNum) noexcept void JUCE_API JUCE_CALLTYPE logAssertion (const char* const filename, const int lineNum) noexcept
{ {
String m ("JUCE Assertion failure in "); String m ("JUCE Assertion failure in ");
m << File::createFileWithoutCheckingPath (filename).getFileName() << ':' << lineNum; m << File::createFileWithoutCheckingPath (filename).getFileName() << ':' << lineNum;

2
modules/juce_core/system/juce_StandardHeader.h
View file

@ -156,7 +156,7 @@
namespace juce namespace juce
{ {
extern JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger(); extern JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger();
extern JUCE_API void logAssertion (const char* file, int line) noexcept; extern JUCE_API void JUCE_CALLTYPE logAssertion (const char* file, int line) noexcept;
#include "../memory/juce_Memory.h" #include "../memory/juce_Memory.h"
#include "../maths/juce_MathsFunctions.h" #include "../maths/juce_MathsFunctions.h"

4
modules/juce_gui_basics/menus/juce_PopupMenu.cpp
View file

@ -738,12 +738,12 @@ private:
for (int col = 0; col < numColumns; ++col) for (int col = 0; col < numColumns; ++col)
{ {
int i, colW = options.standardHeight, colH = 0; int colW = options.standardHeight, colH = 0;
const int numChildren = jmin (items.size() - childNum, const int numChildren = jmin (items.size() - childNum,
(items.size() + numColumns - 1) / numColumns); (items.size() + numColumns - 1) / numColumns);
for (i = numChildren; --i >= 0;) for (int i = numChildren; --i >= 0;)
{ {
colW = jmax (colW, items.getUnchecked (childNum + i)->getWidth()); colW = jmax (colW, items.getUnchecked (childNum + i)->getWidth());
colH += items.getUnchecked (childNum + i)->getHeight(); colH += items.getUnchecked (childNum + i)->getHeight();