Browse Source

[3025] Rename variable

The bug is in offset pointer, not in the red-black tree.
Michal 'vorner' Vaner 11 years ago
parent
commit
290fb63c1c
2 changed files with 8 additions and 7 deletions
  1. 1 1
      configure.ac
  2. 7 6
      m4macros/ax_boost_for_bind10.m4

+ 1 - 1
configure.ac

@@ -912,7 +912,7 @@ if test "x$use_shared_memory" = "xyes"; then
 fi
 AC_SUBST(BOOST_MAPPED_FILE_CXXFLAG)
 
-if test "$BOOST_RBTREE_OLD" = "yes" -a "$use_shared_memory" = "yes" ; then
+if test "$BOOST_OFFSET_PTR_OLD" = "yes" -a "$use_shared_memory" = "yes" ; then
     AC_MSG_ERROR([You're trying to compile against boost older than 1.48 with
 shared memory. This is known to cause problems under certain situations.
 

+ 7 - 6
m4macros/ax_boost_for_bind10.m4

@@ -30,9 +30,10 @@ dnl                             compile managed_mapped_file (can be empty).
 dnl                             It is of no use if "WOULDFAIL" is yes.
 dnl   BOOST_STATIC_ASSERT_WOULDFAIL set to "yes" if BOOST_STATIC_ASSERT would
 dnl                                 cause build error; otherwise set to "no"
-dnl   BOOST_RBTREE_OLD if the version of boost is older than 1.48. The old
-dnl                    version confuses some versions of gcc optimisations and
-dnl                    certain files should be compiled without optimisations.
+dnl   BOOST_OFFSET_PTR_OLD if the version of boost is older than 1.48. The old
+dnl                        version confuses some versions of gcc optimisations
+dnl                        and certain files should be compiled without
+dnl                        optimisations.
 
 AC_DEFUN([AX_BOOST_FOR_BIND10], [
 AC_LANG_SAVE
@@ -117,13 +118,13 @@ if test "X$GXX" = "Xyes"; then
    #error Too old
    #endif
    ],,[AC_MSG_RESULT(no)
-       BOOST_RBTREE_OLD=no
+       BOOST_OFFSET_PTR_OLD=no
    ],[AC_MSG_RESULT(yes)
-      BOOST_RBTREE_OLD=yes])
+      BOOST_OFFSET_PTR_OLD=yes])
 else
    # This doesn't matter for non-g++
    BOOST_NUMERIC_CAST_WOULDFAIL=no
-   BOOST_RBTREE_OLD=no
+   BOOST_OFFSET_PTR_OLD=no
 fi
 
 # Boost interprocess::managed_mapped_file is highly system dependent and