[MOAB-dev] r4788 - in MOAB/trunk: src test

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-05-02 11:37:07 -0500 (Mon, 02 May 2011)
New Revision: 4788

Modified:
   MOAB/trunk/src/VarLenTag.hpp
   MOAB/trunk/test/VarLenTagTest.cpp
Log:
Fix warnings about VarLenTagData template

Modified: MOAB/trunk/src/VarLenTag.hpp
===================================================================
--- MOAB/trunk/src/VarLenTag.hpp	2011-05-02 15:44:03 UTC (rev 4787)
+++ MOAB/trunk/src/VarLenTag.hpp	2011-05-02 16:37:07 UTC (rev 4788)
@@ -19,7 +19,7 @@
 
 /* The trivial implementation */
 public VarLenTagData {
-protected:
+public:
 
   struct { struct { unsigned size; unsigned char* array; } mPointer; } mData;
 };
@@ -32,7 +32,7 @@
  * value field so no memory needs to be allocated.
  */
 class VarLenTagData {
-protected:
+public:
 
   enum {
     INLINE_COUNT = sizeof(unsigned char*)
@@ -72,7 +72,6 @@
 class VarLenTagDataTemplate {
 public:
   inline VarLenTagDataTemplate() {}
-protected:
 
   struct MallocData {
     unsigned char* array;
@@ -100,7 +99,6 @@
 {
 public:
   inline VarLenTagDataTemplate<0u>() {}
-protected:
 
   enum {
     INLINE_COUNT = sizeof(unsigned char*)
@@ -125,30 +123,33 @@
 /**\brief Class for storing variable-length tag data
  *
  * Class for managing variable-length tag data.  
- *\NOTE This class must behave as if it were initialized to
+ *\NOTE This class must behave as if it were initialized to empty
  *      if it is memset to zero w/out invoking any constructor.
  */ 
-class VarLenTag : public VarLenTagData {
+class VarLenTag {
+protected:
+  VarLenTagData mData;
 public: