[Libreoffice-commits] .: Branch 'libreoffice-3-6' - mysqlcppconn/mysql_config.pmk

[Michael Stahl]

 mysqlcppconn/mysql_config.pmk |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit aeb97e51b05e1dfd6d535704a115213809c707fc
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Jul 20 14:17:54 2012 +0200

    fdo#52275: Revert "mysqlcppconn: work around weird gcc issue"
    
    This reverts commit d3d533c9e45b6badf202a12f0ed266d0168aa636.
    
    Hard-coding -std=c++xy in one module is a bad idea.
    
    None of these gccs give any spurious error in gnu++11 mode now:
    gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2)
    gcc (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5)
    (cherry picked from commit 9931d736edfedb9b82a270d754f1ee8a2b134ec7)
    
    Change-Id: I9aaa541bfc888a000ab3a1836bbd3fcfb9ef5bac
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
index 9c9c76a..eb316e0 100644
--- a/mysqlcppconn/mysql_config.pmk
+++ b/mysqlcppconn/mysql_config.pmk
@@ -47,9 +47,3 @@ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 
 CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
 
-# workaround for gcc bug (4.6.1 20110908):
-# it complains about std::basic string operator= overloading ambiguity
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-std=c++98
-.ENDIF # "$(COM)"=="GCC"
-