[111426] trunk/dports/devel/codeblocks

[mojca at macports.org]

Revision: 111426
          https://trac.macports.org/changeset/111426
Author:   mojca at macports.org
Date:     2013-09-21 05:22:11 -0700 (Sat, 21 Sep 2013)
Log Message:
-----------
codeblocks: remove 'tr1::' for c++11 (closes #40515)

Modified Paths:
--------------
    trunk/dports/devel/codeblocks/Portfile

Added Paths:
-----------
    trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff

Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile	2013-09-21 09:52:36 UTC (rev 111425)
+++ trunk/dports/devel/codeblocks/Portfile	2013-09-21 12:22:11 UTC (rev 111426)
@@ -50,6 +50,7 @@
 # patch-src-sdk-wxscintilla-src-PlatWX.cpp.diff:              fixed upstream
 patchfiles          patch-MouseSap-Makefile.diff \
                     patch-Makefile.diff \
+                    patch-src-include-prep.h.diff \
                     patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff \
                     patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff \
                     patch-src-sdk-wxscintilla-src-PlatWX.cpp.diff \

Added: trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff	                        (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff	2013-09-21 12:22:11 UTC (rev 111426)
@@ -0,0 +1,28 @@
+http://cplusplusmusings.wordpress.com/2013/06/03/whats-up-with-tr1-and-c11-and-libc/
+--- src/include/prep.h.orig
++++ src/include/prep.h
+@@ -406,14 +406,24 @@ template<typename whatever> inline ID GetID()
+ inline ID GetID() { return GetID<void>(); }
+ inline ID ConstructID(unsigned int i) { return ID(i); }
+ 
++#if __cplusplus >= 201103L
++#include <memory>
++#else
+ #include <tr1/memory>
++#endif
+ 
+ // Add std::shared_ptr in a namespace, so different implementations can be used with different compilers
+ namespace cb
+ {
++#if __cplusplus >= 201103L
++    using std::shared_ptr;
++    using std::static_pointer_cast;
++    using std::weak_ptr;
++#else
+     using std::tr1::shared_ptr;
+     using std::tr1::static_pointer_cast;
+     using std::tr1::weak_ptr;
++#endif
+ }
+ 
+ #if defined(__APPLE__) && defined(__MACH__)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130921/151ec976/attachment.html>