Ticket #49449: osx108-no-cxx11.patch

layer2/CifMoleculeReader.cpp

@@ -2106 +2106 @@
   }
 
   const char * filename = NULL;
+#ifndef _PYMOL_NO_CXX11
   auto cif = std::make_shared<cif_file>(filename, st);
+#else
+  cif_file _cif_stack(filename, st);
+  auto cif = &_cif_stack;
+#endif
 
   for (auto it = cif->datablocks.begin(); it != cif->datablocks.end(); ++it) {
     ObjectMolecule * obj = ObjectMoleculeReadCifData(G, it->second, discrete);
@@ -2117 +2122 @@
       continue;
     }
 
-#ifndef _PYMOL_NOPY
+#if !defined(_PYMOL_NOPY) && !defined(_PYMOL_NO_CXX11)
     // we only provide access from the Python API so far
     if (SettingGetGlobal_b(G, cSetting_cif_keepinmemory)) {
       obj->m_cifdata = it->second;

layer2/ObjectMolecule.cpp

@@ -12561 +12561 @@
   VLAFreeP(I->DiscreteAtmToIdx);
   VLAFreeP(I->DiscreteCSet);
   VLAFreeP(I->CSet);
+#ifndef _PYMOL_NO_CXX11
   I->m_ciffile.reset(); // free data
+#endif
 
   {
     int nAtom = I->NAtom;

layer2/ObjectMolecule.h

@@ -86 +86 @@
   int RepVisCache;     /* for transient storage during updates */
 
   // for reporting available assembly ids after mmCIF loading - SUBJECT TO CHANGE
+#ifndef _PYMOL_NO_CXX11
   std::shared_ptr<cif_file> m_ciffile;
+#endif
   const cif_data * m_cifdata;
 
   // methods

setup.py

@@ -213 +213 @@
             ("NO_MMLIBS",None),
             ]
 
+    if sys.platform == 'darwin':
+        import platform
+        if int(platform.mac_ver()[0].split('.')[1]) < 9:
+            # OS X <= 10.8, will still use some C++11 features
+            # like the "auto" keyword, but excludes features which
+            # depend on the C++11 std library.
+            def_macros += [
+                ('_PYMOL_NO_CXX11', None),
+            ]
+
     try:
         import numpy
         inc_dirs += [