Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove atomic static shim. (#1020)

Browse Source 
This was only useful for pre-VS2015 and was only being used in one place.
This commit is contained in:
Peter Johnson
2018-05-04 02:07:27 -07:00
committed by GitHub
parent 8cbfe35bd4
commit 5c2c5ccd07
2 changed files with 1 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpiutil/src/main/native/include/wpi/jni_util.h
View File

@@ -22,7 +22,6 @@
#include "wpi/SmallString.h"
#include "wpi/SmallVector.h"
#include "wpi/StringRef.h"
#include "wpi/atomic_static.h"
#include "wpi/deprecated.h"
#include "wpi/mutex.h"
#include "wpi/raw_ostream.h"
@@ -441,9 +440,6 @@ inline jobjectArray MakeJStringArray(JNIEnv* env, ArrayRef<std::string> arr) {
// static JavaVM* GetJVM();
// static const char* GetName();
// void CallJava(JNIEnv *env, jobject func, jmethodID mid);
//
// When creating this, ATOMIC_STATIC_INIT() needs to be performed on the
// templated class as well.
template <typename T>
class JCallbackThread : public SafeThread {
public:
@@ -522,12 +518,9 @@ template <typename T>
class JSingletonCallbackManager : public JCallbackManager<T> {
public:
static JSingletonCallbackManager<T>& GetInstance() {
ATOMIC_STATIC(JSingletonCallbackManager<T>, instance);
static JSingletonCallbackManager<T> instance;
return instance;
}
private:
ATOMIC_STATIC_DECL(JSingletonCallbackManager<T>)
};
inline std::string GetJavaStackTrace(JNIEnv* env, std::string* func,