[MOAB-dev] r3580 - MOAB/trunk
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Wed Mar 10 12:15:10 CST 2010
Author: kraftche
Date: 2010-03-10 12:15:10 -0600 (Wed, 10 Mar 2010)
New Revision: 3580
Removed:
MOAB/trunk/MB.dsw
MOAB/trunk/MBAlloc.cpp
MOAB/trunk/MBAlloc.hpp
MOAB/trunk/MBMem.cpp
MOAB/trunk/MBMem.hpp
MOAB/trunk/cmake/
MOAB/trunk/doxygen/
MOAB/trunk/m4/
MOAB/trunk/mhdf/
MOAB/trunk/parallel/
MOAB/trunk/refiner/
MOAB/trunk/testdir.h.in
Log:
code rearranging part 4 of 5: remove dead code, unused files, and now unused directories
Deleted: MOAB/trunk/MB.dsw
===================================================================
--- MOAB/trunk/MB.dsw 2010-03-10 18:12:47 UTC (rev 3579)
+++ MOAB/trunk/MB.dsw 2010-03-10 18:15:10 UTC (rev 3580)
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "MB"=.\MB.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "MBUtil"=.\MBUtil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "MBTest"=.\MBTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name MB
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name MBUtil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Deleted: MOAB/trunk/MBAlloc.cpp
===================================================================
--- MOAB/trunk/MBAlloc.cpp 2010-03-10 18:12:47 UTC (rev 3579)
+++ MOAB/trunk/MBAlloc.cpp 2010-03-10 18:15:10 UTC (rev 3580)
@@ -1,45 +0,0 @@
-/**
- * MOAB, a Mesh-Oriented datABase, is a software component for creating,
- * storing and accessing finite element mesh data.
- *
- * Copyright 2004 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
- * retains certain rights in this software.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- */
-
-
-#include "MBAlloc.hpp"
-#include <stdlib.h>
-#include <string.h>
-
-
-// C malloc/free fucntions
-void* mdb_malloc(size_t size, const char* filename, int linenumber)
-{
- filename = filename;
- linenumber = linenumber;
- return malloc(size);
-}
-
-void* mdb_calloc(size_t size, const char* filename, int linenumber)
-{
- filename = filename;
- linenumber = linenumber;
- void* ptr = malloc(size);
- memset(ptr, 0, size);
- return ptr;
-}
-
-void mdb_free(void* ptr)
-{
- free(ptr);
-}
-
-
-
Deleted: MOAB/trunk/MBAlloc.hpp
===================================================================
--- MOAB/trunk/MBAlloc.hpp 2010-03-10 18:12:47 UTC (rev 3579)
+++ MOAB/trunk/MBAlloc.hpp 2010-03-10 18:15:10 UTC (rev 3580)
@@ -1,157 +0,0 @@
-/**
- * MOAB, a Mesh-Oriented datABase, is a software component for creating,
- * storing and accessing finite element mesh data.
- *
- * Copyright 2004 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
- * retains certain rights in this software.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- */
-
-
-
-#ifndef MB_ALLOCATOR_HPP
-#define MB_ALLOCATOR_HPP
-
-// Don't #include any MB files here,
-// this is just a framework for memory allocations.
-#include <memory>
-
-// C malloc/free fucntions
-void* mdb_malloc(size_t size, const char* filename=NULL, int linenumber=0);
-void* mdb_calloc(size_t size, const char* filename=NULL, int linenumber=0);
-void mdb_free(void* ptr);
-
-#define MB_MALLOC(size) mdb_malloc(size, __FILE__, __LINE__)
-#define MB_CALLOC(size) mdb_malloc(size, __FILE__, __LINE__)
-#define MB_FREE(ptr) mdb_free (ptr)
-
-// memory allocation template that works with STL containers
-// it keeps track of who is using how much memory
-
-#define DECLARE_MB_ALLOCATOR_TEMPLATE( classname ) \
-template < class T > class classname \
-{ \
- /* the real allocator that we'll use */ \
- static std::allocator<T> mAllocator; \
-public: \
- \
- static unsigned long mNumBytesAllocated; \
- \
- /* type definitions */ \
- typedef T value_type; \
- typedef T* pointer; \
- typedef const T* const_pointer; \
- typedef T& reference; \
- typedef const T& const_reference; \
- typedef size_t size_type; \
- typedef ptrdiff_t difference_type; \
- \
- /* rebind allocator to type U */ \
- template <class U> struct rebind \
- { \
- typedef classname <U> other; \
- }; \
- \
- /* return addresses of values */ \
- pointer address(reference value) const \
- { \
- return &value; \
- } \
- const_pointer address(const_reference value) const \
- { \
- return &value; \
- } \
- \
- /* constructor and destructor -- */ \
- /* does nothing because allocator has no state */ \
- classname() {} \
- classname( const classname & ) {} \
- /* windows doesn't like this constructor */ \
- /*template <class U> classname (const classname <U>&) {} */ \
- ~classname() {} \
- \
- /* return the maximum number of elements that can be allocated */ \
- /*size_type max_size() const*/ \
- /*{*/ \
- /*return std::numeric_limits<std::size_t>::max() / sizeof(T);*/ \
- /*}*/ \
- \
- /* allocate but don't initialize number of elements of type T */ \
- pointer allocate(size_type num, const void* = 0) \
- { \
- mNumBytesAllocated+= num*sizeof(T); \
- return mAllocator.allocate(num); \
- /*return (pointer)(::operator new(num*sizeof(T))); */ \
- } \
- \
- /* initialize elements of allocated storage p with value */ \
- void construct(pointer p, const T& value) \
- { \
- new((void*)p)T(value); \
- } \
- \
- /* destroy elements of initialized storage p */ \
- void destroy(pointer p) \
- { \
- p->~T(); \
- } \
- \
- /* deallocate storage p of deleted elements */ \
- void deallocate(pointer p, size_type num) \
- { \
- mNumBytesAllocated -= num*sizeof(T); \
- mAllocator.deallocate(p,num); \
- /*::operator delete((void*)p);*/ \
- } \
- \
-}; \
- \
-/* return that all specializations of this allocator are interchangeable */ \
-template <class T1, class T2> \
-bool operator==(const classname <T1>&, const classname <T2>&) \
-{ \
- return true; \
-} \
-template <class T1, class T2> \
-bool operator!=(const classname <T1>&, const classname <T2>&) \
-{ \
- return false; \
-} \
-
-
-
-// DEFINE_MB_ALLOCATOR_CLASS macros used to define
-// the static members of the allocator class
-// takes intermediate class name and template type
-
-// windows and gcc want static template members
-// to be instantiated for each template type
-#if defined(__GNUC__) || defined(WIN32)
-#define DEFINE_MB_ALLOCATOR_CLASS( classname , nametype ) \
-std::allocator<nametype> classname<nametype>::mAllocator; \
-unsigned long classname<nametype>::mNumBytesAllocated = 0;
-#else
-#define DEFINE_MB_ALLOCATOR_CLASS( classname , nametype ) \
-template <class T> std::allocator<T> classname<T>::mAllocator; \
-template <class T> unsigned long classname<T>::mNumBytesAllocated = 0;
-#endif
-
-
-// DECLARE_MB_ALLOCATOR_CLASS macro used to declare
-// an allocator class that you'll use
-// takes intermediate class name, template type, and name of class you want
-
-#define DECLARE_MB_ALLOCATOR_CLASS( classname, nametype, deftype ) \
-DECLARE_MB_ALLOCATOR_TEMPLATE( classname ) \
-typedef classname < nametype > deftype;
-
-
-#endif
-
-
Deleted: MOAB/trunk/MBMem.cpp
===================================================================
--- MOAB/trunk/MBMem.cpp 2010-03-10 18:12:47 UTC (rev 3579)
+++ MOAB/trunk/MBMem.cpp 2010-03-10 18:15:10 UTC (rev 3580)
@@ -1,39 +0,0 @@
-/**
- * MOAB, a Mesh-Oriented datABase, is a software component for creating,
- * storing and accessing finite element mesh data.
- *
- * Copyright 2004 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
- * retains certain rights in this software.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- */
-
-
-
-/* File : MBMem.cpp
- * Purpose : Track Memory usage and memory debugging in MB
- * Creator : Clinton Stimpson
- * Date : 28 Aug 2002
-*/
-
-
-/* Settings:
- *
- * MB_MEM_DEBUG -- If defined, will dump MB.log file with memory errors.
- *
-*/
-
-
-#include "MBMem.hpp"
-#include "MBInterface.hpp"
-
-
-// Allocator for adjacency vectors in AEntityFactory
-DEFINE_MB_ALLOCATOR_CLASS( MBAllocator, MBEntityHandle )
-
-
Deleted: MOAB/trunk/MBMem.hpp
===================================================================
--- MOAB/trunk/MBMem.hpp 2010-03-10 18:12:47 UTC (rev 3579)
+++ MOAB/trunk/MBMem.hpp 2010-03-10 18:15:10 UTC (rev 3580)
@@ -1,44 +0,0 @@
-/**
- * MOAB, a Mesh-Oriented datABase, is a software component for creating,
- * storing and accessing finite element mesh data.
- *
- * Copyright 2004 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
- * retains certain rights in this software.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- */
-
-
-#ifndef MB_MEM_HPP
-#define MB_MEM_HPP
-
-/* File : MBMem.hpp
- * Purpose : Track Memory usage and memory debugging in MB
- * Creator : Clinton Stimpson
- * Date : 28 Aug 2002
-*/
-
-
-/* Settings:
- *
- * MB_MEM_DEBUG -- If defined, will dump MB.log file with memory errors.
- *
-*/
-
-#include "MBAlloc.hpp"
-#include "MBTypes.h"
-
-// define the allocators to use in various parts of MB
-
-// Allocator for adjacency vectors in AEntityFactory
-DECLARE_MB_ALLOCATOR_CLASS( MBAllocator, MBEntityHandle, MBAdjacencyVectorAllocator )
-// the type of vector to use for storing adjacency information
-typedef std::vector<MBEntityHandle, MBAdjacencyVectorAllocator > MBAdjacencyVector;
-
-
-#endif // MB_MEM_HPP
Deleted: MOAB/trunk/testdir.h.in
===================================================================
--- MOAB/trunk/testdir.h.in 2010-03-10 18:12:47 UTC (rev 3579)
+++ MOAB/trunk/testdir.h.in 2010-03-10 18:15:10 UTC (rev 3580)
@@ -1,3 +0,0 @@
-#ifndef TEST_DIR
-# define TEST_DIR "@top_srcdir@/test"
-#endif
More information about the moab-dev
mailing list