Implement some C++11 functionality

Containers now support move ctor and assignment, emplace, and initlists

Author: msharov

bvt/bvt04.cc

@@ -9,6 +9,8 @@ class A {
 public:
     A (void)
     { cout << "A::A\n"; }
+    A (int a)
+    { cout << "A::A(" << a << ")\n"; }
     A (const A&)
     { cout << "Copy A::A\n"; }
     const A& operator= (const A&)
@@ -63,6 +65,18 @@ void TestVector (void)
     ctv.assign (3, a);
     ctv.pop_back();
     cout << "Class insertion testing successful\n";
+#if HAVE_CPP11
+    v = vector<int>(vector<int>({1,2,3,4,5,6,7,8}));
+    v.insert (v.begin()+3, {11,12,13});
+    v.emplace (v.begin()+7, 22);
+    cout << '{';
+    for (auto i : v)
+	cout << ' ' << i;
+    cout << " }" << endl;
+    ctv.emplace_back (15);
+#else
+    cout << "{ 1 2 3 11 12 13 4 22 5 6 7 8 }\nA::A(15)\nA::~A\n";
+#endif
 }
 
 StdBvtMain (TestVector)

bvt/bvt04.std

@@ -18,7 +18,10 @@ A::A
 A::operator=
 A::operator=
 A::operator=
+A::~A
 Class insertion testing successful
+{ 1 2 3 11 12 13 4 22 5 6 7 8 }
+A::A(15)
 A::~A
 A::~A
 A::~A

bvt/bvt11.cc

@@ -15,9 +15,17 @@ void PrintVector (const int* first, const int* last)
 
 void TestSetAndMultiset (void)
 {
+#if HAVE_CPP11
+    set<int> v (set<int>({ 1, 8, 2, 3, 1, 1, 4, 6, 1, 3, 4 }));
+    multiset<int> mv (multiset<int>({ 1, 8, 9, 2, 3, 4, 6, 1, 3, 4 }));
+    v.emplace (9);
+    mv.emplace (1);
+    mv.emplace (1);
+#else
     const int vv[] = { 1, 8, 9, 2, 3, 1, 1, 4, 6, 1, 3, 4 };
     set<int> v (VectorRange (vv));
     multiset<int> mv (VectorRange (vv));
+#endif
     cout << "set:\t\t";
     PrintVector (v.begin(), v.end());
     cout << "erase(3):\t";

bvt/bvt14.cc

@@ -17,14 +17,23 @@ void TestMap (void)
     months["june"] = 30;
     months["july"] = 31;
     months["august"] = 31;
+#if HAVE_CPP11
+    months.insert ({
+	{"september",30},
+	{"october",31},
+	{"november",30},
+	{"december",31}
+    });
+#else
     months["september"] = 30;
     months["october"] = 31;
     months["november"] = 30;
     months["december"] = 31;
+#endif
 
     const monthmap_t& cmonths = months;
     cout << "There are " << cmonths["january"] << " days in january." << endl;
-    cout << "There are " << cmonths["september"] << " days in september." << endl;
+    cout << "There are " << cmonths.at("september") << " days in september." << endl;
     cout << "There are " << cmonths["december"] << " days in december." << endl;
     monthmap_t::const_iterator found_may = months.find ("may");
     cout << found_may->first << " found at index " << found_may - months.begin() << endl;
@@ -49,7 +58,11 @@ void TestMap (void)
     cout << endl;
 
     mcopy = months;
+#if HAVE_CPP11
+    monthmap_t::iterator frob = mcopy.emplace_hint (mcopy.begin(), make_pair (string("frobuary"), 42));
+#else
     monthmap_t::iterator frob = mcopy.insert (mcopy.begin(), make_pair (string("frobuary"), 42));
+#endif
     cout << "After inserting " << frob->first << "," << frob->second << ":" << endl;
     for (i = mcopy.begin(); i < mcopy.end(); ++ i)
 	cout << i->first << " ";

bvt/bvt15.cc

@@ -23,8 +23,13 @@ void TestMultiMap (void)
     employees.insert (make_pair (27000, string("Jim"))); 
     employees.insert (make_pair (99000, string("BigBoss"))); 
     employees.insert (make_pair (47000, string("Gail"))); 
+#if HAVE_CPP11
+    employees.emplace (make_pair (15000, string("Dumb")));
+    employees.insert ({47000, "Barbara"});
+#else
     employees.insert (make_pair (15000, string("Dumb"))); 
     employees.insert (make_pair (47000, string("Barbara"))); 
+#endif
     employees.insert (make_pair (47000, string("Mary"))); 
 
     cout << "As-inserted listing:\n";

bvt/bvt18.cc

@@ -12,24 +12,29 @@ void TestTuple (const char* ctrType)
     cout << "Testing " << ctrType << endl;
     cout << "================================================" << endl;
     assert (N <= 8);
-    T pt1v[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
-    T increment;
+#if HAVE_CPP11
+    tuple<N,T> pt1 ({1,2,3,4,5,6,7,8});
+    tuple<N,T> pt2;
+    pt2 = {4,4,4,4};
+    pt2 += {1,2,3,4};
+#else
+    T pt1v[12] = { 1, 2, 3, 4, 5, 6, 7, 8 };
     tuple<N,T> pt1 (pt1v);
-    tuple<N,T> pt2 (5, 6, 7, 8);
-    increment = pt1v[2];
+    tuple<N,T> pt2 (&pt1v[4]);
+#endif
 
     cout << "pt1:\t\t\tsize = " << pt1.size() << ", value = " << pt1 << endl;
     cout << "pt2:\t\t\t" << pt2 << endl;
     iota (pt2.begin(), pt2.end(), 10);
     cout << "pt2:\t\t\t" << pt2 << endl;
 
-    pt1 *= increment;
+    pt1 *= 3;
     cout << "pt1 *= 3:\t\t" << pt1 << endl;
-    pt1 /= increment;
+    pt1 /= 3;
     cout << "pt1 /= 3:\t\t" << pt1 << endl;
-    pt1 += increment;
+    pt1 += 3;
     cout << "pt1 += 3:\t\t" << pt1 << endl;
-    pt1 -= increment;
+    pt1 -= 3;
     cout << "pt1 -= 3:\t\t" << pt1 << endl;
 
     pt1 *= pt2;

cmemlink.h

@@ -64,6 +64,7 @@ class cmemlink {
     inline size_type	max_size (void) const		{ return (size()); }
     inline size_type	readable_size (void) const	{ return (size()); }
     inline bool		empty (void) const		{ return (!size()); }
+   inline const_pointer	data (void) const		{ return (m_Data); }
    inline const_pointer	cdata (void) const		{ return (m_Data); }
     inline iterator	begin (void) const		{ return (iterator (cdata())); }
     inline iterator	iat (size_type i) const		{ assert (i <= size()); return (begin() + i); }

config.h.in

@@ -54,11 +54,12 @@
     #define DLL_LOCAL
     #define INLINE
 #endif
-#if __cplusplus >= 201103L && (!__GNUC__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+#if __cplusplus >= 201103L && (!__GNUC__ || (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
     #define HAVE_CPP11 1
 #endif
 #if !HAVE_CPP11
     #define noexcept		throw()
+    #define constexpr
 #endif
 #if __GNUC__ >= 3 && (__i386__ || __x86_64__)
     /// GCC 3+ supports the prefetch directive, which some CPUs use to improve caching

configure

@@ -62,7 +62,7 @@ stdlib.h string.h time.h unistd.h math.h stdlib.h sys/mman.h";
 LIBS="supc++ gcc_eh SystemStubs"
 
 # First pair is used if nothing matches
-PROGS="CC=gcc CC=cc CXX=g++ CXX=c++ DOXYGEN=doxygen LD=ld AR=ar RANLIB=ranlib RANLIB=touch INSTALL=install"
+PROGS="CC=gcc CC=clang CC=cc CXX=g++ CXX=clang++ CXX=c++ DOXYGEN=doxygen LD=ld AR=ar RANLIB=ranlib RANLIB=touch INSTALL=install"
 
 # Environment variables
 ENVIRONS="CXXFLAGS LDFLAGS"
@@ -231,7 +231,7 @@ int main (void)
 	    printf (SET(CPU_HAS_%s,1), s_CpuCaps[i].name);
 #if __GNUC__ >= 3
     printf ("s/ \\?@PROCESSOR_OPTS@/");
-    #if __clang_major__ >= 3 || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+    #if (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
 	printf (" -std=c++11 -march=native");
     #else
 	if (caps & (1<<23))		printf (" -mmmx");

memblock.cc

@@ -112,7 +112,7 @@ void memblock::shrink_to_fit (void)
 }
 
 /// Shifts the data in the linked block from \p start to \p start + \p n.
-memblock::iterator memblock::insert (iterator start, size_type n)
+memblock::iterator memblock::insert (const_iterator start, size_type n)
 {
     const uoff_t ip = start - begin();
     assert (ip <= size());
@@ -122,7 +122,7 @@ memblock::iterator memblock::insert (iterator start, size_type n)
 }
 
 /// Shifts the data in the linked block from \p start + \p n to \p start.
-memblock::iterator memblock::erase (iterator start, size_type n)
+memblock::iterator memblock::erase (const_iterator start, size_type n)
 {
     const uoff_t ep = start - begin();
     assert (ep + n <= size());