Commit 15002676 authored by Jacob Potter's avatar Jacob Potter

Use std::experimental::optional in the test suite.

parent da4ef208
......@@ -8,8 +8,8 @@
#include "primitive_list.hpp"
#include "set_record.hpp"
#include <cstdint>
#include <experimental/optional>
#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
......@@ -47,5 +47,5 @@ public:
static void check_client_interface_nonascii(const std::shared_ptr<ClientInterface> & i);
static std::optional<int32_t> return_none();
static std::experimental::optional<int32_t> return_none();
};
......@@ -199,9 +199,9 @@ CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_TestHelpers_returnNone(J
try {
DJINNI_FUNCTION_PROLOGUE0(jniEnv);
std::optional<int32_t> cr = TestHelpers::return_none();
std::experimental::optional<int32_t> cr = TestHelpers::return_none();
return ::djinni::HOptional<std::optional, ::djinni::HI32>::toJava(jniEnv, cr);
return ::djinni::HOptional<std::experimental::optional, ::djinni::HI32>::toJava(jniEnv, cr);
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */ )
}
......
......@@ -175,7 +175,7 @@
+ (NSNumber *)returnNone {
try {
std::optional<int32_t> cppRet = TestHelpers::return_none();
std::experimental::optional<int32_t> cppRet = TestHelpers::return_none();
NSNumber *objcRet;
if (cppRet) {
objcRet = [NSNumber numberWithInt:(*(cppRet))];
......
......@@ -85,6 +85,6 @@ void TestHelpers::check_client_interface_nonascii(const std::shared_ptr<ClientIn
}
}
std::optional<int32_t> TestHelpers::return_none() {
std::experimental::optional<int32_t> TestHelpers::return_none() {
return {};
}
......@@ -534,7 +534,7 @@
65868B6E1989FE4200D60EEE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
DSTROOT = /tmp/DjinniObjcTest.dst;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
OTHER_CPLUSPLUSFLAGS = (
......@@ -551,7 +551,7 @@
65868B6F1989FE4200D60EEE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
DSTROOT = /tmp/DjinniObjcTest.dst;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
OTHER_CPLUSPLUSFLAGS = (
......
......@@ -57,6 +57,8 @@ $base_dir/../src/run-assume-built \
\
--cpp-out "$temp_out/cpp" \
--ident-cpp-enum-type foo_bar \
--cpp-optional-template "std::experimental::optional" \
--cpp-optional-header "<experimental/optional>" \
\
--jni-out "$temp_out/jni" \
--ident-jni-class NativeFooBar \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment