From 3cccfc15da4eda796d79b3b50cadd081ba308bc4 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Tue, 26 Jul 2016 01:36:35 -0700
Subject: [PATCH] Update to SourcePawn 1.9 and the latest AMTL.

---
 core/logic/CDataPack.cpp     | 4 ++--
 core/logic/smn_functions.cpp | 2 +-
 public/amtl                  | 2 +-
 public/sm_stringhashmap.h    | 2 +-
 sourcepawn                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/logic/CDataPack.cpp b/core/logic/CDataPack.cpp
index 39fea990..67ec2146 100644
--- a/core/logic/CDataPack.cpp
+++ b/core/logic/CDataPack.cpp
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "CDataPack.h"
-#include <am-utility.h>
-#include <am-vector.h>
+#include <amtl/am-autoptr.h>
+#include <amtl/am-vector.h>
 
 using namespace ke;
 
diff --git a/core/logic/smn_functions.cpp b/core/logic/smn_functions.cpp
index 4b0ea105..fc4f763b 100644
--- a/core/logic/smn_functions.cpp
+++ b/core/logic/smn_functions.cpp
@@ -34,7 +34,7 @@
 #include <IHandleSys.h>
 #include <IForwardSys.h>
 #include <ISourceMod.h>
-#include <am-utility.h>
+#include <amtl/am-autoptr.h>
 
 HandleType_t g_GlobalFwdType = 0;
 HandleType_t g_PrivateFwdType = 0;
diff --git a/public/amtl b/public/amtl
index 70325e21..b200aabd 160000
--- a/public/amtl
+++ b/public/amtl
@@ -1 +1 @@
-Subproject commit 70325e218f9896d1f33cacb654ca721c3851abeb
+Subproject commit b200aabd680994e8726f4211d2190a7cb587254a
diff --git a/public/sm_stringhashmap.h b/public/sm_stringhashmap.h
index 39f9c0b0..def1540b 100644
--- a/public/sm_stringhashmap.h
+++ b/public/sm_stringhashmap.h
@@ -110,7 +110,7 @@ public:
 		  memory_used_(0)
 	{
 		if (!internal_.init())
-			internal_.reportOutOfMemory();
+			internal_.allocPolicy().reportOutOfMemory();
 	}
 
 	typedef typename Internal::Result Result;
diff --git a/sourcepawn b/sourcepawn
index 594bfbb5..675afe26 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 594bfbb5e46a47ed57af28786254e9fb8c2c506f
+Subproject commit 675afe26cfa4c316c494d7c6e359294a2409180b