amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of linker errors preventing optimized compile on Linux.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1352 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2009-01-14 19:13:05 +00:00
parent 0bc1c1af30
commit 30671ad5b0
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/basic.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ String format_input(const String& format, const ScriptValue& input) {
// determine type of input
ScriptType type = input.type();
if (type == SCRIPT_DATETIME) {
return static_cast<wxDateTime>(input).Format(format.c_str());
input.toDateTime().Format(format.c_str());
} else {
// determine type expected by format string
String fmt = _("%") + replace_all(format, _("%"), _(""));
src/script/value.hpp
+11 -8
View File
@@ -49,7 +49,7 @@ enum CompareWhat
class ScriptValue : public IntrusivePtrBaseWithDelete {
public:
virtual ~ScriptValue() {}
/// Information on the type of this value
virtual ScriptType type() const = 0;
/// Name of the type of value
@@ -57,7 +57,7 @@ class ScriptValue : public IntrusivePtrBaseWithDelete {
/// How to compare this object?
/** Returns 1 if the pointer should be used, 0 otherwise */
virtual CompareWhat compareAs(String& compare_str, void const*& compare_ptr) const;
/// Convert this value to a string
virtual operator String() const;
/// Convert this value to a double
@@ -70,20 +70,23 @@ class ScriptValue : public IntrusivePtrBaseWithDelete {
virtual operator AColor() const;
/// Convert this value to a wxDateTime
virtual operator wxDateTime() const;
/// Script code to generate this value
virtual String toCode() const;
/// Explicit overload to convert to a string
/** This is sometimes necessary, because wxString has an int constructor,
* which confuses gcc. */
inline String toString() const { return *this; }
/// Explicit overload to convert to a wxDateTime
/** Overload resolution is sometimes confused by other conversions */
inline wxDateTime toDateTime() const { return *this; }
/// Convert this value to an image
virtual GeneratedImageP toImage(const ScriptValueP& thisP) const;
/// Get a member variable from this value
virtual ScriptValueP getMember(const String& name) const;
/// Signal that a script depends on this value itself
virtual void dependencyThis(const Dependency& dep);
/// Signal that a script depends on a member of this value
@@ -92,7 +95,7 @@ class ScriptValue : public IntrusivePtrBaseWithDelete {
/// Signal that a script depends on a member of container, with the name of this
/** This function allows for a kind of visitor pattern over dependencyMember */
virtual ScriptValueP dependencyName(const ScriptValue& container, const Dependency&) const;
/// Evaluate this value (if it is a function)
virtual ScriptValueP eval(Context&) const;
/// Mark the scripts that this function depends on
@@ -103,7 +106,7 @@ class ScriptValue : public IntrusivePtrBaseWithDelete {
* Alternatively, the closure may be modified in place.
*/
virtual ScriptValueP simplifyClosure(ScriptClosure&) const;
/// Return an iterator for the current collection, an iterator is a value that has next()
/** thisP can be used to prevent destruction of the collection */
virtual ScriptValueP makeIterator(const ScriptValueP& thisP) const;