Commit 6dc5fdfd by Phil Edwards

linker-map.gnu: Verbose comments, clean up spacing.

2002-08-23  Phil Edwards  <pme@gcc.gnu.org>

	* config/linker-map.gnu:  Verbose comments, clean up spacing.
	* include/bits/stl_alloc.h:  Fix indentation of 'if' bodies, return
	statements.
	__allocator:  Change class declaration to struct.
	* docs/html/17_intro/C++STYLE:  Fix typo.
	* include/bits/stl_deque.h, include/bits/stl_list.h,
	include/bits/stl_map.h, include/bits/stl_multimap.h,
	include/bits/stl_vector.h:  Fix fallout from typo.

From-SVN: r56540
parent 939e32f0
2002-08-23 Phil Edwards <pme@gcc.gnu.org>
* config/linker-map.gnu: Verbose comments, clean up spacing.
* include/bits/stl_alloc.h: Fix indentation of 'if' bodies, return
statements.
__allocator: Change class declaration to struct.
* docs/html/17_intro/C++STYLE: Fix typo.
* include/bits/stl_deque.h, include/bits/stl_list.h,
include/bits/stl_map.h, include/bits/stl_multimap.h,
include/bits/stl_vector.h: Fix fallout from typo.
2002-08-22 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set
......
......@@ -42,6 +42,8 @@ GLIBCPP_3.2 {
};
# Names not in an 'extern' block are mangled names.
# std::has_facet*
_ZSt9has_facet*;
# operator new(unsigned)
......
......@@ -173,7 +173,7 @@ Notable areas of divergence from what may be previous local practice
int foo;
13. Spacing WRT return statements.
no extra spacing before returns
no extra spacing before returns, no parenthesis
ie
}
......@@ -184,6 +184,12 @@ Notable areas of divergence from what may be previous local practice
return __ret;
-NOT-
}
return (__ret);
14. Location of global variables.
All global variables of class type, whether in the "user visable"
space (e.g., cin) or the implementation namespace, must be defined
......@@ -360,7 +366,3 @@ namespace std
}
} // namespace std
......@@ -111,6 +111,7 @@ namespace std
{ ::operator delete(__p); }
};
/**
* @if maint
* A malloc-based allocator. Typically slower than the
......@@ -159,7 +160,7 @@ namespace std
{
void (* __old)() = __malloc_alloc_oom_handler;
__malloc_alloc_oom_handler = __f;
return(__old);
return __old;
}
};
......@@ -183,7 +184,7 @@ namespace std
(*__my_malloc_handler)();
__result = malloc(__n);
if (__result)
return(__result);
return __result;
}
}
......@@ -204,7 +205,7 @@ namespace std
(*__my_malloc_handler)();
__result = realloc(__p, __n);
if (__result)
return(__result);
return __result;
}
}
#endif
......@@ -479,7 +480,7 @@ namespace std
{
__result = _S_start_free;
_S_start_free += __total_bytes;
return(__result);
return __result ;
}
else if (__bytes_left >= __size)
{
......@@ -487,7 +488,7 @@ namespace std
__total_bytes = __size * __nobjs;
__result = _S_start_free;
_S_start_free += __total_bytes;
return(__result);
return __result;
}
else
{
......@@ -521,7 +522,7 @@ namespace std
*__my_free_list = __p -> _M_free_list_link;
_S_start_free = (char*)__p;
_S_end_free = _S_start_free + __i;
return(_S_chunk_alloc(__size, __nobjs));
return _S_chunk_alloc(__size, __nobjs);
// Any leftover piece will eventually make it to the
// right free list.
}
......@@ -533,7 +534,7 @@ namespace std
}
_S_heap_size += __bytes_to_get;
_S_end_free = _S_start_free + __bytes_to_get;
return(_S_chunk_alloc(__size, __nobjs));
return _S_chunk_alloc(__size, __nobjs);
}
}
......@@ -554,7 +555,7 @@ namespace std
int __i;
if (1 == __nobjs)
return(__chunk);
return __chunk;
__my_free_list = _S_free_list + _S_freelist_index(__n);
// Build free list in chunk.
......@@ -784,7 +785,7 @@ namespace std
};
template<typename _Alloc>
class __allocator<void, _Alloc>
struct __allocator<void, _Alloc>
{
typedef size_t size_type;
typedef ptrdiff_t difference_type;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment