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

Some win32 clean-ups.

Browse source
This commit is contained in:
Julian Storer 2010-05-10 11:16:00 +01:00
parent 6fd0c918d9
commit 42666db484
28 changed files with 1465 additions and 1475 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/text/juce_String.cpp
View file

@ -23,25 +23,22 @@
==============================================================================
*/
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable: 4514)
#endif
#include <locale>
#include "../core/juce_StandardHeader.h"
#if JUCE_MSVC
#include <float.h>
#pragma warning (push)
#pragma warning (disable: 4514)
#endif
#include <locale>
BEGIN_JUCE_NAMESPACE
#include "juce_String.h"
#include "../core/juce_Atomic.h"
#include "../io/streams/juce_OutputStream.h"
#ifdef _MSC_VER
#if JUCE_MSVC
#pragma warning (pop)
#endif
@ -1689,12 +1686,12 @@ const String String::formatted (const juce_wchar* const pf, ... )
const int num = (int) vswprintf (result.text, bufferSize - 1, pf, tempArgs);
va_end (tempArgs);
#elif JUCE_WINDOWS
#ifdef _MSC_VER
#if JUCE_MSVC
#pragma warning (push)
#pragma warning (disable: 4996)
#endif
const int num = (int) _vsnwprintf (result.text, bufferSize - 1, pf, args);
#ifdef _MSC_VER
#if JUCE_MSVC
#pragma warning (pop)
#endif
#else
@ -2133,9 +2130,9 @@ const char* String::toCString() const
}
}
#ifdef _MSC_VER
#pragma warning (disable: 4514 4996)
#if JUCE_MSVC
#pragma warning (push)
#pragma warning (disable: 4514 4996)
#endif
int String::getNumBytesAsCString() const throw()
@ -2153,7 +2150,7 @@ int String::copyToCString (char* destBuffer, const int maxBufferSizeBytes) const
return numBytes;
}
#ifdef _MSC_VER
#if JUCE_MSVC
#pragma warning (pop)
#endif