Cool! Good job Jane!
-------- Original message --------
From: janehu(a)mcs.anl.gov
Date: 11/01/2013 12:45 PM (GMT-06:00)
To: cgma-dev(a)mcs.anl.gov
Subject: [cgma-dev] r6082 - in cgm/branches/merge-cubit14.0: . compat compat/new geom itaps test
Author: janehu
Date: 2013-11-01 12:45:08 -0500 (Fri, 01 Nov 2013)
New Revision: 6082
Added:
cgm/branches/merge-cubit14.0/compat/
cgm/branches/merge-cubit14.0/compat/Makefile.am
cgm/branches/merge-cubit14.0/compat/new/
cgm/branches/merge-cubit14.0/compat/new/new.h
cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp
cgm/branches/merge-cubit14.0/geom/CubitCompat.h.in
cgm/branches/merge-cubit14.0/geom/CubitCompat.hpp
cgm/branches/merge-cubit14.0/test/cylinders.cpp
cgm/branches/merge-cubit14.0/test/s5.sat
cgm/branches/merge-cubit14.0/test/s5.stp
cgm/branches/merge-cubit14.0/test/spheres.cpp
Modified:
cgm/branches/merge-cubit14.0/itaps/Makefile.am
cgm/branches/merge-cubit14.0/itaps/iGeom_CGMA.cc
cgm/branches/merge-cubit14.0/test/Makefile.am
cgm/branches/merge-cubit14.0/test/r_w.cpp
cgm/branches/merge-cubit14.0/test/subtract.cpp
Log:
Added missing files; Removed some of the warnings; Passed make check for cubit shared, occ static and shared builds. Ready to move to bitbucket.
Added: cgm/branches/merge-cubit14.0/compat/Makefile.am
===================================================================
--- cgm/branches/merge-cubit14.0/compat/Makefile.am (rev 0)
+++ cgm/branches/merge-cubit14.0/compat/Makefile.am 2013-11-01 17:45:08 UTC (rev 6082)
@@ -0,0 +1 @@
+EXTRA_DIST = new/new.h
Added: cgm/branches/merge-cubit14.0/compat/new/new.h
===================================================================
--- cgm/branches/merge-cubit14.0/compat/new/new.h (rev 0)
+++ cgm/branches/merge-cubit14.0/compat/new/new.h 2013-11-01 17:45:08 UTC (rev 6082)
@@ -0,0 +1,11 @@
+#include <new>
+
+// According to section 18.4 of the 2005-10-19 working draft
+// of the C++ Standard (Doc no: N1905=05-0165), these are the
+// symbols defined in the <new> header.
+
+using std::bad_alloc;
+using std::nothrow_t;
+using std::nothrow;
+using std::new_handler;
+using std::set_new_handler;
Added: cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp
===================================================================
--- cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp (rev 0)
+++ cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp 2013-11-01 17:45:08 UTC (rev 6082)
@@ -0,0 +1,93 @@
+#include "CubitCompat.h"
+#include "CubitCompat.hpp"
+#include "GeometryQueryTool.hpp"
+#include <string.h>
+
+#define CUBIT_COMPAT_FT_ELIF(TYPE) \
+ else if (!strcmp(file_type,#TYPE)) \
+ return TYPE ## _TYPE
+
+static Model_File_Type
+CubitCompat_file_type( const char* file_type )
+{
+ if (!file_type)
+ return MFT_NOT_DEFINED;
+ CUBIT_COMPAT_FT_ELIF(ACIS);
+ CUBIT_COMPAT_FT_ELIF(ACIS_SAT);
+ CUBIT_COMPAT_FT_ELIF(ACIS_SAB);
+ CUBIT_COMPAT_FT_ELIF(ACIS_DEBUG);
+ CUBIT_COMPAT_FT_ELIF(IGES);
+ CUBIT_COMPAT_FT_ELIF(CATIA);
+ CUBIT_COMPAT_FT_ELIF(STEP);
+ CUBIT_COMPAT_FT_ELIF(PROE);
