Convert array to HNI

Summary: #fixes 3648 array_multisort has not been moved to HNI because it requires mixed variadic arguments, which is currently not supported by HNI. Reviewed By: @ptarjan Differential Revision: D1551812
facebook · Sep 26, 2014 · b44deaf · b44deaf
1 parent 982da71
commit b44deaf
Show file tree

Hide file tree

Showing 20 changed files with 2,483 additions and 2,601 deletions.
diff --git a/hphp/runtime/debugger/cmd/cmd_constant.cpp b/hphp/runtime/debugger/cmd/cmd_constant.cpp
@@ -16,7 +16,7 @@
 
 #include "hphp/runtime/debugger/cmd/cmd_constant.h"
 #include "hphp/runtime/base/class-info.h"
-#include "hphp/runtime/ext/ext_array.h"
+#include "hphp/runtime/ext/array/ext_array.h"
 
 namespace HPHP { namespace Eval {
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@ void CmdConstant::onClient(DebuggerClient &client) {
 
     {
       Variant forSort(cmd->m_constants);
-      f_ksort(ref(forSort));
+      HHVM_FN(ksort)(ref(forSort));
       assert(forSort.is(KindOfArray));
       m_constants = forSort.asCell()->m_data.parr;
     }

diff --git a/hphp/runtime/debugger/cmd/cmd_extension.cpp b/hphp/runtime/debugger/cmd/cmd_extension.cpp
@@ -17,7 +17,7 @@
 #include "hphp/runtime/debugger/cmd/cmd_extension.h"
 #include <set>
 #include <vector>
-#include "hphp/runtime/ext/ext_array.h"
+#include "hphp/runtime/ext/array/ext_array.h"
 #include "hphp/util/text-art.h"
 
 using namespace HPHP::TextArt;