diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab2e6a64d4..291efeed84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -867,7 +867,7 @@ add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND})
 ########################################
 # Start compiling our code
 #
-add_definitions(-std=gnu++0x)
+add_definitions(-std=c++1y)
 
 # These aren't actually needed for C11/C++11
 # but some dependencies require them (LLVM, libav).
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
index 2c1f688d5b..5f96356e69 100644
--- a/Source/Core/Core/MemTools.cpp
+++ b/Source/Core/Core/MemTools.cpp
@@ -190,7 +190,7 @@ static void ExceptionThread(mach_port_t port)
 			msg_out.flavor = 0;
 			msg_out.new_stateCnt = 0;
 		}
-		msg_out.Head.msgh_size = offsetof(typeof(msg_out), new_state) + msg_out.new_stateCnt * sizeof(natural_t);
+		msg_out.Head.msgh_size = offsetof(__typeof__(msg_out), new_state) + msg_out.new_stateCnt * sizeof(natural_t);
 
 		send_msg = &msg_out.Head;
 		send_size = msg_out.Head.msgh_size;