[SCM] WorldForge terrain library branch, master, updated. upstream/0.3.0-19-g560665e

Stephen M. Webb stephen.webb at bregmasoft.ca
Wed May 16 20:02:50 UTC 2012 

The following commit has been merged in the master branch:
commit 560665e56cfcb8afaa2a00bc32d4150ad8ac0df9
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed May 16 15:32:03 2012 -0400

    marked symbols as optional for GCC 4.7 (closes: #667274)

diff --git a/debian/changelog b/debian/changelog
index e063ff6..90ea5b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mercator (0.3.0-2) UNRELEASED; urgency=low
+
+  * marked symbols as optional for GCC 4.7 (closes: #667274)
+
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Mon, 07 May 2012 17:18:23 -0700
+
 mercator (0.3.0-1) unstable; urgency=low
 
   * new upstream release
diff --git a/debian/libmercator-0.3-1.symbols b/debian/libmercator-0.3-1.symbols
index 3f0140e..92795d4 100644
--- a/debian/libmercator-0.3-1.symbols
+++ b/debian/libmercator-0.3-1.symbols
@@ -3,6 +3,8 @@ libmercator-0.3.so.1 libmercator-0.3-1 #MINVER#
  _ZN18ZeroSpiralOrderingD1Ev at Base 0.3.0
  _ZN18ZeroSpiralOrderingD2Ev at Base 0.3.0
  _ZN18ZeroSpiralOrderingclEii at Base 0.3.0
+ (optional=inline)_ZN6WFMath7PolygonILi2EED1Ev at Base 0.3.0
+ (optional=inline)_ZN6WFMath7PolygonILi2EED2Ev at Base 0.3.0
  _ZN8Mercator10AreaShaderC1Ei at Base 0.3.0
  _ZN8Mercator10AreaShaderC2Ei at Base 0.3.0
  _ZN8Mercator10AreaShaderD0Ev at Base 0.3.0
@@ -407,21 +409,29 @@ libmercator-0.3.so.1 libmercator-0.3-1 #MINVER#
  _ZNK8Mercator7Terrain3getEff at Base 0.3.0
  _ZNK8Mercator9LowShader14checkIntersectERKNS_7SegmentE at Base 0.3.0
  _ZNK8Mercator9LowShader5shadeERNS_7SurfaceE at Base 0.3.0
- _ZNKSt8_Rb_treeIiSt4pairIKiPKN8Mercator4AreaEESt10_Select1stIS6_ESt4lessIiESaIS6_EE5countERS1_ at Base 0.3.0
+ (optional=inline)_ZNKSt8_Rb_treeIiSt4pairIKiPKN8Mercator4AreaEESt10_Select1stIS6_ESt4lessIiESaIS6_EE5countERS1_ at Base 0.3.0
+ (optional=inline)_ZNKSt8_Rb_treeISsSt4pairIKSsfESt10_Select1stIS2_ESt4lessISsESaIS2_EE4findERS1_ at Base 0.3.0
+ (optional=inline)_ZNSt10_List_baseIN8Mercator4EdgeESaIS1_EE8_M_clearEv at Base 0.3.0
+ (regex|optional=inline)_ZNSt3setIPN8Mercator7SegmentESt4lessIS2_ESaIS2_EED[12]Ev at Base 0.3.0
  _ZNSt4listIN8Mercator4EdgeESaIS1_EE4sortEv at Base 0.3.0
  _ZNSt4listIN8Mercator4EdgeESaIS1_EE5mergeERS3_ at Base 0.3.0
+ (optional=inline)_ZNSt4pairIKSsPN8Mercator9ShaderKitEED1Ev at Base 0.3.0
+ (optional=inline)_ZNSt4pairIKSsPN8Mercator9ShaderKitEED2Ev at Base 0.3.0
  _ZNSt6vectorIN6WFMath5PointILi2EEESaIS2_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS2_S4_EERKS2_ at Base 0.3.0
+ (optional=inline)_ZNSt6vectorIN6WFMath5PointILi2EEESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EERKS2_ at Base 0.3.0
  _ZNSt6vectorIN6WFMath5PointILi2EEESaIS2_EEaSERKS4_ at Base 0.3.0
  _ZNSt6vectorIN8Mercator4EdgeESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_ at Base 0.3.0
  _ZNSt6vectorIN8Mercator7SpeciesESaIS1_EED1Ev at Base 0.3.0
  _ZNSt6vectorIN8Mercator7SpeciesESaIS1_EED2Ev at Base 0.3.0
  (regex)_ZNSt6vectorImSaImEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPmS1_EE[mj]RKm at Base 0.3.0
+ (regex|optional=inline)_ZNSt6vectorImSaImEED[12]Ev at Base 0.3.0
  _ZNSt8_Rb_treeIPKN8Mercator10TerrainModES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE10_M_insert_EPKSt18_Rb_tree_node_baseSC_RKS3_ at Base 0.3.0
- _ZNSt8_Rb_treeIPKN8Mercator10TerrainModES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE16_M_insert_uniqueERKS3_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIPKN8Mercator10TerrainModES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE16_M_insert_uniqueERKS3_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIPKN8Mercator10TerrainModES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE4findERKS3_ at Base 0.3.0
  _ZNSt8_Rb_treeIPKN8Mercator10TerrainModES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E at Base 0.3.0
  _ZNSt8_Rb_treeIPKN8Mercator8EffectorESt4pairIKS3_N6WFMath7AxisBoxILi2EEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE10_M_insert_EPKSt18_Rb_tree_node_baseSI_RKS9_ at Base 0.3.0
- _ZNSt8_Rb_treeIPKN8Mercator8EffectorESt4pairIKS3_N6WFMath7AxisBoxILi2EEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE16_M_insert_uniqueERKS9_ at Base 0.3.0
- _ZNSt8_Rb_treeIPKN8Mercator8EffectorESt4pairIKS3_N6WFMath7AxisBoxILi2EEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE5eraseERS5_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIPKN8Mercator8EffectorESt4pairIKS3_N6WFMath7AxisBoxILi2EEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE16_M_insert_uniqueERKS9_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIPKN8Mercator8EffectorESt4pairIKS3_N6WFMath7AxisBoxILi2EEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE5eraseERS5_ at Base 0.3.0
  _ZNSt8_Rb_treeIPKN8Mercator8EffectorESt4pairIKS3_N6WFMath7AxisBoxILi2EEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E at Base 0.3.0
  _ZNSt8_Rb_treeIPN8Mercator7SegmentES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKS2_ at Base 0.3.0
  _ZNSt8_Rb_treeIPN8Mercator7SegmentES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueERKS2_ at Base 0.3.0
@@ -441,11 +451,12 @@ libmercator-0.3.so.1 libmercator-0.3-1 #MINVER#
  _ZNSt8_Rb_treeIiSt4pairIKiN8Mercator9BasePointEESt10_Select1stIS4_ESt4lessIiESaIS4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS4_ERKS4_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiN8Mercator9BasePointEESt10_Select1stIS4_ESt4lessIiESaIS4_EE7_M_copyEPKSt13_Rb_tree_nodeIS4_EPSC_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiN8Mercator9BasePointEESt10_Select1stIS4_ESt4lessIiESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E at Base 0.3.0
- _ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator4AreaEESt10_Select1stIS6_ESt4lessIiESaIS6_EE15_M_insert_equalERKS6_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator4AreaEESt10_Select1stIS6_ESt4lessIiESaIS6_EE15_M_insert_equalERKS6_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator4AreaEESt10_Select1stIS6_ESt4lessIiESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator6ShaderEESt10_Select1stIS6_ESt4lessIiESaIS6_EE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS6_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator6ShaderEESt10_Select1stIS6_ESt4lessIiESaIS6_EE16_M_insert_uniqueERKS6_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator6ShaderEESt10_Select1stIS6_ESt4lessIiESaIS6_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS6_ERKS6_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator6ShaderEESt10_Select1stIS6_ESt4lessIiESaIS6_EE4findERS1_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPKN8Mercator6ShaderEESt10_Select1stIS6_ESt4lessIiESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator6ShaderEESt10_Select1stIS5_ESt4lessIiESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator7SegmentEESt10_Select1stIS5_ESt4lessIiESaIS5_EE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS5_ at Base 0.3.0
@@ -456,6 +467,7 @@ libmercator-0.3.so.1 libmercator-0.3-1 #MINVER#
  _ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator7SurfaceEESt10_Select1stIS5_ESt4lessIiESaIS5_EE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS5_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator7SurfaceEESt10_Select1stIS5_ESt4lessIiESaIS5_EE16_M_insert_uniqueERKS5_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator7SurfaceEESt10_Select1stIS5_ESt4lessIiESaIS5_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS5_ERKS5_ at Base 0.3.0
+ (optional=inline)_ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator7SurfaceEESt10_Select1stIS5_ESt4lessIiESaIS5_EE4findERS1_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiPN8Mercator7SurfaceEESt10_Select1stIS5_ESt4lessIiESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiSt3mapIiN8Mercator5PlantESt4lessIiESaIS0_IS1_S4_EEEESt10_Select1stISA_ES6_SaISA_EE10_M_insert_EPKSt18_Rb_tree_node_baseSH_RKSA_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiSt3mapIiN8Mercator5PlantESt4lessIiESaIS0_IS1_S4_EEEESt10_Select1stISA_ES6_SaISA_EE16_M_insert_uniqueERKSA_ at Base 0.3.0
@@ -469,14 +481,15 @@ libmercator-0.3.so.1 libmercator-0.3-1 #MINVER#
  _ZNSt8_Rb_treeIiSt4pairIKiSt3mapIiPN8Mercator7SegmentESt4lessIiESaIS0_IS1_S5_EEEESt10_Select1stISB_ES7_SaISB_EE16_M_insert_uniqueERKSB_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiSt3mapIiPN8Mercator7SegmentESt4lessIiESaIS0_IS1_S5_EEEESt10_Select1stISB_ES7_SaISB_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISB_ERKSB_ at Base 0.3.0
  _ZNSt8_Rb_treeIiSt4pairIKiSt3mapIiPN8Mercator7SegmentESt4lessIiESaIS0_IS1_S5_EEEESt10_Select1stISB_ES7_SaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E at Base 0.3.0
- (regex)_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEE[il]S3_NS2_7EdgeAtYEEvT_T0_SB_T1_T2_ at Base 0.3.0
+ (regex|optional=inline)_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEE[il]S3_NS2_7EdgeAtYEEvT_T0_SB_T1_T2_ at Base 0.3.0
  (regex)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEE[il]S3_NS2_7EdgeAtYEEvT_T0_SB_T1_T2_ at Base 0.3.0
  _ZSt13__heap_selectIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEENS2_7EdgeAtYEEvT_SA_SA_T0_ at Base 0.3.0
  _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEENS2_7EdgeAtYEEvT_SA_T0_ at Base 0.3.0
  (regex)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEE[il]NS2_7EdgeAtYEEvT_SA_T0_T1_ at Base 0.3.0
- _ZSt19__move_median_firstIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEENS2_7EdgeAtYEEvT_SA_SA_T0_ at Base 0.3.0
- _ZSt21__unguarded_partitionIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEES3_NS2_7EdgeAtYEET_SA_SA_RKT0_T1_ at Base 0.3.0
+ (optional=inline)_ZSt19__move_median_firstIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEENS2_7EdgeAtYEEvT_SA_SA_T0_ at Base 0.3.0
+ (optional=inline)_ZSt21__unguarded_partitionIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEES3_NS2_7EdgeAtYEET_SA_SA_RKT0_T1_ at Base 0.3.0
  _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEENS2_7EdgeAtYEEvT_T0_ at Base 0.3.0
+ (optional=inline)_ZSt9sort_heapIN9__gnu_cxx17__normal_iteratorIPN8Mercator4EdgeESt6vectorIS3_SaIS3_EEEENS2_7EdgeAtYEEvT_SA_T0_ at Base 0.3.0
  _ZTI18ZeroSpiralOrdering at Base 0.3.0
  _ZTIN8Mercator10AreaShaderE at Base 0.3.0
  _ZTIN8Mercator10BandShaderE at Base 0.3.0

-- 
WorldForge terrain library

More information about the Pkg-games-commits mailing list