Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added patch to remove closing colons for namespace declarations,

Browse source 
which annoys gcc 3.4
This commit is contained in:
maroy 2005-01-18 13:55:09 +00:00
parent d09d18f838
commit f11f86bcab
2 changed files with 133 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/tools/libodbc++/libodbc++-0.2.3/bin/install.sh
View file

@ -22,7 +22,7 @@
#
#
# Author : $Author: maroy $
# Version : $Revision: 1.2 $
# Version : $Revision: 1.3 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3/bin/Attic/install.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@ -36,6 +36,7 @@ reldir=`dirname $0`/..
basedir=`cd $reldir; pwd;`
installdir=`cd $basedir/../../../usr; pwd;`
tmpdir=$basedir/tmp
etcdir=$basedir/etc
tar=$basedir/src/$product.tar.gz
echo "installing $product from $basedir to $installdir"
@ -46,6 +47,7 @@ cd $tmpdir
tar xfz $tar
cd $product
patch -p1 < $etcdir/libodbc++-no-namespace-closing-colon.patch
./configure --prefix=$installdir
make install

130
livesupport/tools/libodbc++/libodbc++-0.2.3/etc/libodbc++-no-namespace-closing-colon.patch Normal file
View file

@ -0,0 +1,130 @@
diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h
--- libodbc++-0.2.3/include/odbc++/callablestatement.h 2003-03-20 16:52:27.000000000 +0100
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h 2005-01-18 14:47:32.761605624 +0100
@@ -160,7 +160,7 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_CALLABLESTATEMENT_H
diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h
--- libodbc++-0.2.3/include/odbc++/connection.h 2001-06-12 12:38:16.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h 2005-01-18 14:47:41.210321224 +0100
@@ -204,7 +204,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_CONNECTION_H
diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h
--- libodbc++-0.2.3/include/odbc++/databasemetadata.h 2001-06-12 12:38:17.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h 2005-01-18 14:47:44.922756848 +0100
@@ -1333,7 +1333,7 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_DATABASEMETADATA_H
diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h
--- libodbc++-0.2.3/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h 2005-01-18 14:47:48.704181984 +0100
@@ -147,7 +147,7 @@
-};
+}
#endif // __ODBCXX_DRIVERMANAGER_H
diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h
--- libodbc++-0.2.3/include/odbc++/errorhandler.h 2001-06-12 12:38:18.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h 2005-01-18 14:47:53.838401464 +0100
@@ -127,6 +127,6 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif
diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h
--- libodbc++-0.2.3/include/odbc++/preparedstatement.h 2003-05-09 10:45:48.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h 2005-01-18 14:47:57.663819912 +0100
@@ -211,6 +211,6 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_PREPAREDSTATEMENT_H
diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h
--- libodbc++-0.2.3/include/odbc++/resultset.h 2001-06-12 12:38:19.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h 2005-01-18 14:48:01.966165856 +0100
@@ -619,7 +619,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_RESULTSET_H
diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h
--- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h 2001-06-12 12:38:20.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h 2005-01-18 14:48:05.372647992 +0100
@@ -176,7 +176,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_RESULTSETMETADATA_H
diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h
--- libodbc++-0.2.3/include/odbc++/statement.h 2003-03-20 16:52:32.000000000 +0100
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h 2005-01-18 14:48:11.589702856 +0100
@@ -260,7 +260,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_STATEMENT_H
diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h
--- libodbc++-0.2.3/include/odbc++/threads.h 2001-06-12 12:38:20.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h 2005-01-18 14:48:16.409970064 +0100
@@ -65,7 +65,7 @@
}
};
-}; //namespace odbc
+} //namespace odbc
// macro used all over the place
#define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut)
diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h
--- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h 2005-01-18 14:48:22.560035112 +0100
@@ -791,7 +791,7 @@
}
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_TYPES_H