Skip to content

Commit

Permalink
fix include order & revert boost/hash (cocos#12212)
Browse files Browse the repository at this point in the history
PatriceJiang authored Jul 27, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent fd809a1 commit c32ba5d
Showing 6 changed files with 705 additions and 664 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/native-bindings.yml
Original file line number Diff line number Diff line change
@@ -31,6 +31,9 @@ jobs:
python3 ./native/tools/tojs/genbindings.py
rm ./native/tools/tojs/userconf.ini
- name: Update builtin-res
with:
ndk-version: r21e
add-to-path: false
run: |
cd native
npm install -g typescript
14 changes: 8 additions & 6 deletions native/cocos/audio/android/AudioMixer.cpp
Original file line number Diff line number Diff line change
@@ -15,21 +15,23 @@
** limitations under the License.
*/

// clang-format off
#define LOG_TAG "AudioMixer"
#define LOG_NDEBUG 1

#include <math.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <cmath>
#include <sys/types.h>

#include "audio/android/AudioMixer.h"
#include "audio/android/AudioMixerOps.h"
#include "audio/android/audio.h"
#include "audio/android/audio_utils/include/audio_utils/primitives.h"
#include "audio/android/AudioMixerOps.h"
#include "audio/android/AudioMixer.h"
#include "base/memory/Memory.h"

// clang-format on
// The FCC_2 macro refers to the Fixed Channel Count of 2 for the legacy integer mixer.
#ifndef FCC_2
#define FCC_2 2
1,328 changes: 680 additions & 648 deletions native/cocos/base/std/hash/hash.h

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions native/cocos/bindings/jswrapper/v8/debugger/env.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#pragma once

// clang-format off
#include "../../config.h"
#if (SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_V8) && SE_ENABLE_INSPECTOR

#include "inspector_agent.h"

#include "node.h"
#include "util.h"
#include "uv.h"
#include "v8.h"
#include "uv.h"
#include "util.h"
#include "node.h"

namespace node {

@@ -615,3 +614,5 @@ inline bool Environment::AsyncCallbackScope::in_makecallback() {
} // namespace node

#endif // #if (SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_V8) && SE_ENABLE_INSPECTOR

// clang-format on
3 changes: 3 additions & 0 deletions native/cocos/editor-support/spine/HasRendererObject.h
Original file line number Diff line number Diff line change
@@ -30,6 +30,9 @@
#ifndef Spine_HasRendererObject_h
#define Spine_HasRendererObject_h

#include "editor-support/spine/dll.h"
#include <cstdlib>

namespace spine {

typedef void (*DisposeRendererObject)(void* rendererObject);
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

#if len($current_class.module_config) > 0
\#if $current_class.module_config[0]
#end if
extern se::Object *__jsb_${current_class.underlined_class_name} _proto; // NOLINT
extern se::Class *__jsb_${current_class.underlined_class_name} _class; // NOLINT
#end if
extern se::Object *__jsb_${current_class.underlined_class_name}_proto; // NOLINT
extern se::Class *__jsb_${current_class.underlined_class_name}_class; // NOLINT

bool js_register_${current_class.underlined_class_name}(se::Object *obj); // NOLINT

#if $current_class.is_struct
#if $current_class.is_struct
template <>
bool sevalue_to_native(const se::Value &, ${current_class.namespaced_class_name} *, se::Object *ctx); //NOLINT
#end if
#end if

0 comments on commit c32ba5d

Please sign in to comment.