|
@@ -26,6 +26,7 @@
|
|
#include "common/int.h"
|
|
#include "common/int.h"
|
|
|
|
|
|
#include <cstring>
|
|
#include <cstring>
|
|
|
|
+#include <string>
|
|
#include <vector>
|
|
#include <vector>
|
|
#include <set>
|
|
#include <set>
|
|
|
|
|
|
@@ -59,6 +60,7 @@ public:
|
|
: len(len)
|
|
: len(len)
|
|
{
|
|
{
|
|
str = new char[len+1];
|
|
str = new char[len+1];
|
|
|
|
+ str[len] = '\0';
|
|
memcpy(str, string, len);
|
|
memcpy(str, string, len);
|
|
}
|
|
}
|
|
virtual ~SharedString() { delete[] str; }
|
|
virtual ~SharedString() { delete[] str; }
|
|
@@ -99,7 +101,8 @@ public:
|
|
Variant();
|
|
Variant();
|
|
Variant(bool boolean);
|
|
Variant(bool boolean);
|
|
Variant(double number);
|
|
Variant(double number);
|
|
- Variant(const char *string, size_t len);
|
|
|
|
|
|
+ Variant(const char *str, size_t len);
|
|
|
|
+ Variant(const std::string &str);
|
|
Variant(void *lightuserdata);
|
|
Variant(void *lightuserdata);
|
|
Variant(love::Type *type, love::Object *object);
|
|
Variant(love::Type *type, love::Object *object);
|
|
Variant(std::vector<std::pair<Variant, Variant>> *table);
|
|
Variant(std::vector<std::pair<Variant, Variant>> *table);
|