From bda4b78489790f4d86dedf4cd7c4739612957321 Mon Sep 17 00:00:00 2001 From: hogliux Date: Sat, 21 May 2016 08:42:34 +0100 Subject: [PATCH] Add missing assignment operator to var class --- modules/juce_core/containers/juce_Variant.cpp | 1 + modules/juce_core/containers/juce_Variant.h | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/juce_core/containers/juce_Variant.cpp b/modules/juce_core/containers/juce_Variant.cpp index 9e3335df55..7d7a15762d 100644 --- a/modules/juce_core/containers/juce_Variant.cpp +++ b/modules/juce_core/containers/juce_Variant.cpp @@ -504,6 +504,7 @@ var& var::operator= (const double v) { type->cleanUp (value); type = var& var::operator= (const char* const v) { type->cleanUp (value); type = &VariantType_String::instance; new (value.stringValue) String (v); return *this; } var& var::operator= (const wchar_t* const v) { type->cleanUp (value); type = &VariantType_String::instance; new (value.stringValue) String (v); return *this; } var& var::operator= (const String& v) { type->cleanUp (value); type = &VariantType_String::instance; new (value.stringValue) String (v); return *this; } +var& var::operator= (const MemoryBlock& v) { type->cleanUp (value); type = &VariantType_Binary::instance; new (value.binaryValue) MemoryBlock (v); return *this; } var& var::operator= (const Array& v) { var v2 (v); swapWith (v2); return *this; } var& var::operator= (ReferenceCountedObject* v) { var v2 (v); swapWith (v2); return *this; } var& var::operator= (NativeFunction v) { var v2 (v); swapWith (v2); return *this; } diff --git a/modules/juce_core/containers/juce_Variant.h b/modules/juce_core/containers/juce_Variant.h index 8720a0d080..4b57c6a355 100644 --- a/modules/juce_core/containers/juce_Variant.h +++ b/modules/juce_core/containers/juce_Variant.h @@ -95,6 +95,7 @@ public: var& operator= (const char* value); var& operator= (const wchar_t* value); var& operator= (const String& value); + var& operator= (const MemoryBlock& value); var& operator= (const Array& value); var& operator= (ReferenceCountedObject* object); var& operator= (NativeFunction method);