Remove NEWRES macro

pdo_pgsql_connection.cpp

@@ -1,4 +1,3 @@
-#include "pgsql.h"
 #include "pdo_pgsql_connection.h"
 #include "pdo_pgsql_statement.h"
 #include "pdo_pgsql_resource.h"

pdo_pgsql_statement.cpp

@@ -2,7 +2,6 @@
 #include "pdo_pgsql_statement.h"
 #include "pdo_pgsql_connection.h"
 #include "pdo_pgsql.h"
-#include "pgsql.h"
 #include <iomanip>
 
 #define STMT_HANDLE_ERROR(res) (*m_conn).handleError(this, (*m_conn).sqlstate(res), res.errorMessage())
@@ -197,7 +196,7 @@ namespace HPHP {
 
         if(columns.empty()){
             for(int i = 0; i < column_count; i++){
-                columns.set(i, Resource(NEWRES(PDOColumn)()));
+                columns.set(i, Resource(newres<PDOColumn>()));
             }
         }
 

pgsql.cpp

@@ -1,5 +1,5 @@
 #include <queue>
-#include "pgsql.h"
+#include "pq.h"
 
 #include "hphp/runtime/base/array-iterator.h"
 #include "hphp/runtime/base/zend-string.h"
@@ -668,7 +668,7 @@ struct CStringArray {
 static Variant HHVM_FUNCTION(pg_connect, const String& connection_string, int connect_type /* = 0 */) {
     PGSQL * pgsql = nullptr;
 
-    pgsql = NEWRES(PGSQL)(connection_string);
+    pgsql = newres<PGSQL>(connection_string);
 
     if (!pgsql->get()) {
         delete pgsql;
@@ -683,7 +683,7 @@ static Variant HHVM_FUNCTION(pg_pconnect, const String& connection_string, int c
 
     PGSQLConnectionPool& pool = s_connectionPoolContainer.GetPool(connection_string.toCppString());
 
-    pgsql = NEWRES(PGSQL)(pool);
+    pgsql = newres<PGSQL>(pool);
 
     if (!pgsql->get()) {
         delete pgsql;
@@ -1117,7 +1117,7 @@ static Variant HHVM_FUNCTION(pg_query, const Resource& connection, const String&
     if (_handle_query_result("pg_query", conn->get(), res))
         FAIL_RETURN;
 
-    PGSQLResult *pgresult = NEWRES(PGSQLResult)(conn, std::move(res));
+    PGSQLResult *pgresult = newres<PGSQLResult>(conn, std::move(res));
 
     return Resource(pgresult);
 }
@@ -1135,7 +1135,7 @@ static Variant HHVM_FUNCTION(pg_query_params, const Resource& connection, const
     if (_handle_query_result("pg_query_params", conn->get(), res))
         FAIL_RETURN;
 
-    PGSQLResult *pgresult = NEWRES(PGSQLResult)(conn, std::move(res));
+    PGSQLResult *pgresult = newres<PGSQLResult>(conn, std::move(res));
 
     return Resource(pgresult);
 }
@@ -1151,7 +1151,7 @@ static Variant HHVM_FUNCTION(pg_prepare, const Resource& connection, const Strin
     if (_handle_query_result("pg_prepare", conn->get(), res))
         FAIL_RETURN;
 
-    PGSQLResult *pgres = NEWRES(PGSQLResult)(conn, std::move(res));
+    PGSQLResult *pgres = newres<PGSQLResult>(conn, std::move(res));
 
     return Resource(pgres);
 }
@@ -1169,7 +1169,7 @@ static Variant HHVM_FUNCTION(pg_execute, const Resource& connection, const Strin
         FAIL_RETURN;
     }
 
-    PGSQLResult *pgres = NEWRES(PGSQLResult)(conn, std::move(res));
+    PGSQLResult *pgres = newres<PGSQLResult>(conn, std::move(res));
 
     return Resource(pgres);
 }
@@ -1223,7 +1223,7 @@ static Variant HHVM_FUNCTION(pg_get_result, const Resource& connection) {
         FAIL_RETURN;
     }
 
-    PGSQLResult *pgresult = NEWRES(PGSQLResult)(conn, std::move(res));
+    PGSQLResult *pgresult = newres<PGSQLResult>(conn, std::move(res));
 
     return Resource(pgresult);
 }