Detect level of C++ support.

diff --git a/base/base.vcxproj b/base/base.vcxproj
index 9b176e50856d3b637adf76bd937b11a22112e192..3cea6d1ee2b58ffa909c415f1e1aa4437517a30a 100644 (file)
--- a/base/base.vcxproj
+++ b/base/base.vcxproj
@@ -36,6 +36,7 @@
     <ClInclude Include="condvar.h" />
     <ClInclude Include="confighive.h" />
     <ClInclude Include="configobject.h" />
+    <ClInclude Include="cxx11-compat.h" />
     <ClInclude Include="delegate.h" />
     <ClInclude Include="event.h" />
     <ClInclude Include="exception.h" />

diff --git a/base/cxx11-compat.h b/base/cxx11-compat.h
new file mode 100644 (file)
index 0000000..db0a678
--- /dev/null
+++ b/base/cxx11-compat.h
@@ -0,0 +1,22 @@
+#ifndef CXX11COMPAT_H
+#define CXX11COMPAT_H
+
+template <typename T>
+shared_ptr<T> make_shared(void)
+{
+       return shared_ptr<T>(new T());
+}
+
+template <typename T, typename TArg1>
+shared_ptr<T> make_shared(const TArg1& arg1)
+{
+       return shared_ptr<T>(new T());
+}
+
+template <typename T, typename TArg1, typename TArg2>
+shared_ptr<T> make_shared(const TArg1& arg1, const TArg2& arg2)
+{
+       return shared_ptr<T>(new T());
+}
+
+#endif /* CXX11COMPAT_H */

diff --git a/base/delegate.h b/base/delegate.h
index de8f3cd43981c95157bd0148e160f7061ab6c3a1..a5281555062cb938a794ad35b0b49032b4259913 100644 (file)
--- a/base/delegate.h
+++ b/base/delegate.h
@@ -1,8 +1,6 @@
 #ifndef DELEGATE_H
 #define DELEGATE_H
 
-#include <list>
-
 namespace icinga
 {
 
@@ -20,7 +18,7 @@ int delegate_fwd(int (TObject::*function)(TArgs), weak_ptr<TObject> wref, const
 template<class TObject, class TArgs>
 function<int (TArgs)> bind_weak(int (TObject::*function)(TArgs), const weak_ptr<TObject>& wref)
 {
-       return std::tr1::bind<int>(delegate_fwd<TObject, TArgs>, function, wref, _1);
+       return bind<int>(delegate_fwd<TObject, TArgs>, function, wref, _1);
 }
 
 template<class TObject, class TArgs>

diff --git a/base/i2-base.h b/base/i2-base.h
index f0b4b3b572b0a777fc3344ac3c4ccf17c0b79708..b86e055053e6534fb7d324e0a3e1b391e58c0ff6 100644 (file)
--- a/base/i2-base.h
+++ b/base/i2-base.h
@@ -1,7 +1,9 @@
 #ifndef I2BASE_H
 #define I2BASE_H
 
-#ifndef _MSC_VER
+#ifdef _MSC_VER
+#      define HAVE_CXX11
+#else /* _MSC_VER */
 #      include "config.h"
 #endif /* _MSC_VER */
 
@@ -27,7 +29,7 @@
 
 using namespace std;
 
-#ifdef _MSC_VER
+#ifdef HAVE_CXX11
 #      include <memory>
 #      include <functional>
 
@@ -35,7 +37,7 @@ using namespace std::placeholders;
 #else
 #      include <tr1/memory>
 #      include <tr1/functional>
-
+#      include "cxx11-compat.h"
 using namespace std::tr1;
 using namespace std::tr1::placeholders;
 #endif

diff --git a/configure.ac b/configure.ac
index 3abf6feb68ee83be077a2d52761c9bab9fc58863..c2b8ae07d16d10d1577cceffc19ce52262e34ca0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,12 +9,21 @@ AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11])
 
 m4_include([m4/ax_cxx_gcc_abi_demangle.m4])
+m4_include([m4/ax_check_compile_flag.m4])
 
 AM_SILENT_RULES([yes])
 
 AC_PROG_CXX
 AX_CXX_GCC_ABI_DEMANGLE
 
+AX_CHECK_COMPILE_FLAG([-std=c++0x], [have_cxx11_support=yes])
+
+if test "$have_cxx11_support" = "yes"; then
+       CXXFLAGS="$CXXFLAGS -std=c++0x"
+       AC_DEFINE(HAVE_CXX11, 1,
+               [define if the compiler supports C++11])
+fi
+
 
 
 

diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
new file mode 100644 (file)
index 0000000..9212155
--- /dev/null
+++ b/m4/ax_check_compile_flag.m4
@@ -0,0 +1,72 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
\ No newline at end of file