Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
7cbe944f
Commit
7cbe944f
authored
Nov 04, 2014
by
Jacob Potter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enforce use of ARC everywhere; remove broken debug macros.
parent
fab9fe8c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
22 deletions
+5
-22
support-lib/jni/djinni_support.cpp
support-lib/jni/djinni_support.cpp
+0
-18
support-lib/jni/djinni_support.hpp
support-lib/jni/djinni_support.hpp
+0
-4
support-lib/objc/DJIError.mm
support-lib/objc/DJIError.mm
+1
-0
support-lib/objc/DJIWeakPtrWrapper.mm
support-lib/objc/DJIWeakPtrWrapper.mm
+1
-0
support-lib/support_lib.gyp
support-lib/support_lib.gyp
+3
-0
No files found.
support-lib/jni/djinni_support.cpp
View file @
7cbe944f
...
@@ -207,29 +207,11 @@ JniLocalScope::~JniLocalScope() {
...
@@ -207,29 +207,11 @@ JniLocalScope::~JniLocalScope() {
}
}
bool
JniLocalScope
::
_pushLocalFrame
(
JNIEnv
*
const
env
,
jint
capacity
)
{
bool
JniLocalScope
::
_pushLocalFrame
(
JNIEnv
*
const
env
,
jint
capacity
)
{
#ifdef DBX_JNI_LOCAL_FRAME_DEBUG
JNI_DEBUG_LOGF
(
VERBOSE
,
"Pushing local frame count to %d, capacity=%d"
,
s_frameCount
+
1
,
capacity
);
#endif
const
jint
push_res
=
env
->
PushLocalFrame
(
capacity
);
const
jint
push_res
=
env
->
PushLocalFrame
(
capacity
);
#ifdef DBX_JNI_LOCAL_FRAME_DEBUG
if
(
0
==
push_res
)
{
++
s_frameCount
;
}
else
{
JNI_DEBUG_LOGF
(
ERROR
,
"%d <- PushLocalFrame(%d)"
,
push_res
,
capacity
);
env
->
ExceptionDescribe
();
}
#endif
return
0
==
push_res
;
return
0
==
push_res
;
}
}
void
JniLocalScope
::
_popLocalFrame
(
JNIEnv
*
const
env
,
jobject
returnRef
)
{
void
JniLocalScope
::
_popLocalFrame
(
JNIEnv
*
const
env
,
jobject
returnRef
)
{
#ifdef DBX_JNI_LOCAL_FRAME_DEBUG
--
s_frameCount
;
JNI_DEBUG_LOGF
(
VERBOSE
,
"Popping local frame count to %d."
,
s_frameCount
);
#endif
env
->
PopLocalFrame
(
returnRef
);
env
->
PopLocalFrame
(
returnRef
);
}
}
...
...
support-lib/jni/djinni_support.hpp
View file @
7cbe944f
...
@@ -366,10 +366,6 @@ private:
...
@@ -366,10 +366,6 @@ private:
static
bool
_pushLocalFrame
(
JNIEnv
*
const
env
,
jint
capacity
);
static
bool
_pushLocalFrame
(
JNIEnv
*
const
env
,
jint
capacity
);
static
void
_popLocalFrame
(
JNIEnv
*
const
env
,
jobject
returnRef
);
static
void
_popLocalFrame
(
JNIEnv
*
const
env
,
jobject
returnRef
);
#ifdef DBX_JNI_LOCAL_FRAME_DEBUG
static
int
s_frameCount
;
#endif
JNIEnv
*
const
m_env
;
JNIEnv
*
const
m_env
;
const
bool
m_success
;
const
bool
m_success
;
};
};
...
...
support-lib/objc/DJIError.mm
View file @
7cbe944f
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
#include <Foundation/Foundation.h>
#include <Foundation/Foundation.h>
#include "DJIError.h"
#include "DJIError.h"
#include <exception>
#include <exception>
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
namespace
djinni
{
namespace
djinni
{
...
...
support-lib/objc/DJIWeakPtrWrapper.mm
View file @
7cbe944f
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
//
//
#import "DJIWeakPtrWrapper+Private.h"
#import "DJIWeakPtrWrapper+Private.h"
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
@implementation
DBWeakPtrWrapper
@implementation
DBWeakPtrWrapper
...
...
support-lib/support_lib.gyp
View file @
7cbe944f
...
@@ -18,6 +18,9 @@
...
@@ -18,6 +18,9 @@
{
{
"target_name": "djinni_objc",
"target_name": "djinni_objc",
"type": "static_library",
"type": "static_library",
"xcode_settings": {
"CLANG_ENABLE_OBJC_ARC": "YES",
},
"sources": [
"sources": [
"objc/DJIWeakPtrWrapper.mm",
"objc/DJIWeakPtrWrapper.mm",
"objc/DJIError.mm",
"objc/DJIError.mm",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment