[cgma-dev] r5922 - in cgm/branches/merge-cubit12.2: geom util

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-12-17 23:49:44 -0600 (Mon, 17 Dec 2012)
New Revision: 5922

Modified:
   cgm/branches/merge-cubit12.2/geom/ModelQueryEngine.hpp
   cgm/branches/merge-cubit12.2/geom/Surface.hpp
   cgm/branches/merge-cubit12.2/util/DLIList.cpp
   cgm/branches/merge-cubit12.2/util/SDLList.hpp
Log:
eliminate some warnings that show up now when moab is build with cgm
we should probably turn on some levels of warnings for cgm, to catch these
earlier, not in moab only.


Modified: cgm/branches/merge-cubit12.2/geom/ModelQueryEngine.hpp
===================================================================
--- cgm/branches/merge-cubit12.2/geom/ModelQueryEngine.hpp	2012-12-18 00:37:02 UTC (rev 5921)
+++ cgm/branches/merge-cubit12.2/geom/ModelQueryEngine.hpp	2012-12-18 05:49:44 UTC (rev 5922)
@@ -159,7 +159,7 @@
             { ModelQueryEngine::instance()->inc_query_call_stack(); }
           inline ~BeginQuery()
             { ModelQueryEngine::instance()->dec_query_call_stack(); }
-          inline void* operator new(size_t size)
+          inline void* operator new(size_t /*size*/)
             { assert(0); return (void*)0; }
       };
 

Modified: cgm/branches/merge-cubit12.2/geom/Surface.hpp
===================================================================
--- cgm/branches/merge-cubit12.2/geom/Surface.hpp	2012-12-18 00:37:02 UTC (rev 5921)
+++ cgm/branches/merge-cubit12.2/geom/Surface.hpp	2012-12-18 05:49:44 UTC (rev 5922)
@@ -68,8 +68,8 @@
       //- Finds the underlying plane's origin and normal (unit) vector
       //- Returns CubitFailure if not a plane.
 
-      virtual void param_dir(CubitVector &unit_dir_in_world_space,
-        CubitVector &pos_on_surf, double &du, double &dv){}
+      virtual void param_dir(CubitVector &/*unit_dir_in_world_space*/,
+        CubitVector &/*pos_on_surf*/, double &/*du*/, double &/*dv*/){}
 
       virtual CubitStatus closest_point_uv_guess(  
           CubitVector const& location,

Modified: cgm/branches/merge-cubit12.2/util/DLIList.cpp
===================================================================
--- cgm/branches/merge-cubit12.2/util/DLIList.cpp	2012-12-18 00:37:02 UTC (rev 5921)
+++ cgm/branches/merge-cubit12.2/util/DLIList.cpp	2012-12-18 05:49:44 UTC (rev 5922)
@@ -27,16 +27,16 @@
 //- will be grown by {increment} each time it is filled. Memory for the
 //- list is not allocated until the first element is inserted using
 //- {insertLink}. 
-template <class X> MY_INLINE DLIList<X>::DLIList (int size)
+template <class X> MY_INLINE DLIList<X>::DLIList (int size1)
 {
    index      = 0;
    itemCount  = 0;
    listLength = 0;
    listArray  = NULL;
-   if (size)
+   if (size1)
    {
-      listArray = new X [size];
-      listLength = size;
+      listArray = new X [size1];