Merge pull request #76 from google/64-32
One more 64-bit to 32-bit conversion
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 480d8a5..26fe76c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,14 +18,12 @@
ExternalProject_Get_Property(googletest binary_dir)
link_directories(${binary_dir})
-# Enable the latest C++ standard possible
+# Try and enable C++11. Don't use C++14 because it doesn't work in some
+# configurations.
include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(--std=c++14 HAVE_FLAG_CXX_14)
check_cxx_compiler_flag(--std=c++11 HAVE_FLAG_CXX_11)
check_cxx_compiler_flag(--std=c++0x HAVE_FLAG_CXX_0X)
-if (HAVE_FLAG_CXX_14)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14")
-elseif (HAVE_FLAG_CXX_11)
+if (HAVE_FLAG_CXX_11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
elseif (HAVE_FLAG_CXX_0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
index 2d1ce24..d135ef2 100644
--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -17,6 +17,7 @@
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <sys/resource.h>
diff --git a/src/walltime.cc b/src/walltime.cc
index c20066a..8de4770 100644
--- a/src/walltime.cc
+++ b/src/walltime.cc
@@ -15,6 +15,7 @@
#include "walltime.h"
#include <stdio.h>
+#include <stdint.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
