Update upstream AMTL as a submodule.
This commit is contained in:
+10
-10
@@ -48,19 +48,19 @@ public:
|
||||
style = 0;
|
||||
access = 0;
|
||||
}
|
||||
CItem(ke::Moveable<CItem> other)
|
||||
: info(ke::Move(other->info)),
|
||||
display(ke::Move(other->display))
|
||||
CItem(CItem &&other)
|
||||
: info(ke::Move(other.info)),
|
||||
display(ke::Move(other.display))
|
||||
{
|
||||
style = other->style;
|
||||
access = other->access;
|
||||
style = other.style;
|
||||
access = other.access;
|
||||
}
|
||||
CItem & operator =(ke::Moveable<CItem> other)
|
||||
CItem & operator =(CItem &&other)
|
||||
{
|
||||
info = ke::Move(other->info);
|
||||
display = ke::Move(other->display);
|
||||
style = other->style;
|
||||
access = other->access;
|
||||
info = ke::Move(other.info);
|
||||
display = ke::Move(other.display);
|
||||
style = other.style;
|
||||
access = other.access;
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ binary.compiler.cxxincludes += [
|
||||
os.path.join(builder.sourcePath, 'core', 'logic'),
|
||||
os.path.join(builder.sourcePath, 'public'),
|
||||
os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
|
||||
os.path.join(builder.sourcePath, 'public', 'amtl'),
|
||||
os.path.join(builder.sourcePath, 'public', 'amtl', 'include'),
|
||||
os.path.join(SM.mms_root, 'core', 'sourcehook')
|
||||
]
|
||||
binary.compiler.defines += [
|
||||
|
||||
@@ -63,11 +63,11 @@ public:
|
||||
: control_(0)
|
||||
{
|
||||
}
|
||||
Entry(ke::Moveable<Entry> other)
|
||||
Entry(Entry &&other)
|
||||
{
|
||||
control_ = other->control_;
|
||||
data_ = other->data_;
|
||||
other->control_ = 0;
|
||||
control_ = other.control_;
|
||||
data_ = other.data_;
|
||||
other.control_ = 0;
|
||||
}
|
||||
|
||||
~Entry()
|
||||
|
||||
Reference in New Issue
Block a user