@@ -265,34 +265,34 @@ void OutputStream::setNewLineString (const String& newLineString_) | |||
} | |||
//============================================================================== | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const int number) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const int number) | |||
{ | |||
return stream << String (number); | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const int64 number) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const int64 number) | |||
{ | |||
return stream << String (number); | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const double number) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const double number) | |||
{ | |||
return stream << String (number); | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const char character) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const char character) | |||
{ | |||
stream.writeByte (character); | |||
return stream; | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const char* const text) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const char* const text) | |||
{ | |||
stream.write (text, (int) strlen (text)); | |||
return stream; | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryBlock& data) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryBlock& data) | |||
{ | |||
if (data.getSize() > 0) | |||
stream.write (data.getData(), (int) data.getSize()); | |||
@@ -300,7 +300,7 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryBlock& | |||
return stream; | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const File& fileToRead) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const File& fileToRead) | |||
{ | |||
FileInputStream in (fileToRead); | |||
@@ -310,13 +310,13 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const File& fileTo | |||
return stream; | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, InputStream& streamToRead) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, InputStream& streamToRead) | |||
{ | |||
stream.writeFromInputStream (streamToRead, -1); | |||
return stream; | |||
} | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&) | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&) | |||
{ | |||
return stream << stream.getNewLineString(); | |||
} |
@@ -228,28 +228,28 @@ private: | |||
//============================================================================== | |||
/** Writes a number to a stream as 8-bit characters in the default system encoding. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, int number); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, int number); | |||
/** Writes a number to a stream as 8-bit characters in the default system encoding. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, int64 number); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, int64 number); | |||
/** Writes a number to a stream as 8-bit characters in the default system encoding. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, double number); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, double number); | |||
/** Writes a character to a stream. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, char character); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, char character); | |||
/** Writes a null-terminated text string to a stream. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const char* text); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const char* text); | |||
/** Writes a block of data from a MemoryBlock to a stream. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryBlock& data); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryBlock& data); | |||
/** Writes the contents of a file to a stream. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const File& fileToRead); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const File& fileToRead); | |||
/** Writes the complete contents of an input stream to an output stream. */ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, InputStream& streamToRead); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, InputStream& streamToRead); | |||
/** Writes a new-line to a stream. | |||
You can use the predefined symbol 'newLine' to invoke this, e.g. | |||
@@ -258,7 +258,7 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, InputStream& strea | |||
@endcode | |||
@see OutputStream::setNewLineString | |||
*/ | |||
OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&); | |||
JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&); | |||
#endif // __JUCE_OUTPUTSTREAM_JUCEHEADER__ |
@@ -41,16 +41,8 @@ | |||
/** This macro defines the C calling convention used as the standard for Juce calls. */ | |||
#if JUCE_MSVC | |||
#ifdef JUCE_DLL_BUILD | |||
#define JUCE_CALLTYPE __stdcall __declspec (dllexport) | |||
#define JUCE_CDECL __cdecl __declspec (dllexport) | |||
#elif defined (JUCE_DLL) | |||
#define JUCE_CALLTYPE __stdcall __declspec (dllimport) | |||
#define JUCE_CDECL __cdecl __declspec (dllimport) | |||
#else | |||
#define JUCE_CALLTYPE __stdcall | |||
#define JUCE_CDECL __cdecl | |||
#endif | |||
#define JUCE_CALLTYPE __stdcall | |||
#define JUCE_CDECL __cdecl | |||
#else | |||
#define JUCE_CALLTYPE | |||
#define JUCE_CDECL | |||