Revision: 77971
          http://sourceforge.net/p/brlcad/code/77971
Author:   starseeker
Date:     2020-12-15 20:24:24 +0000 (Tue, 15 Dec 2020)
Log Message:
-----------
Update to latest stepcode.  Surprisingly, the tests made after clearing the 
various stepcode warnings but before starting any rework to avoid C4251 issues 
appear to result in a successful Windows build.  A closer reading of 
https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4251
 makes the language a bit more ambigous.  That page documents when C4251 may be 
ignored, but I had the impression ALL of the listed condtiions had to apply.  
It may be that the error can be ignored if ANY of those conditions are true... 
that might explain why the build worked.

Modified Paths:
--------------
    brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.cc
    brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.h
    brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.cc
    brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.h
    brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazy_test.cc
    brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattribute.h
    
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiApplication_instance.cc
    brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
    brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/selects.c
    
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_wrapper_python.cc
    brlcad/branches/stepsync/src/other/stepcode/src/express/expr.c
    brlcad/branches/stepsync/src/other/stepcode/src/test/p21read/p21read.cc
    
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/attribute.cc
    
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr1.cc
    
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr2.cc

Modified: brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.cc
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.cc        
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.cc        
2020-12-15 20:24:24 UTC (rev 77971)
@@ -13,6 +13,7 @@
 #endif
 
 #include <assert.h>
+#include <stdio.h>
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -83,8 +84,7 @@
 
 // ---------------------   benchmark class   ---------------------
 
-benchmark::benchmark(std::string description, bool debugMessages, std::ostream 
&o_stream): ostr(o_stream),
-    descr(description), debug(debugMessages), stopped(false)
+benchmark::benchmark(bool debugMessages): debug(debugMessages), stopped(false)
 {
     initialVals = getMemAndTime();
 }
@@ -94,10 +94,14 @@
     if(!stopped) {
         stop();
         if(debug) {
-            ostr << "benchmark::~benchmark(): stop was not called before 
destructor!" << std::endl;
+            std::cerr << "benchmark::~benchmark(): stop was not called before 
destructor!" << std::endl;
         }
         out();
     }
+    if(benchVals_str) {
+        free((void *)benchVals_str);
+        benchVals_str = NULL;
+    }
 }
 
 void benchmark::stop()
@@ -129,11 +133,6 @@
     return delta;
 }
 
-void benchmark::reset(std::string description)
-{
-    descr = description;
-    reset();
-}
 void benchmark::reset()
 {
     stopped = false;
@@ -140,7 +139,7 @@
     initialVals = getMemAndTime();
 }
 
-std::string benchmark::str()
+const char *benchmark::str()
 {
     return str(get());
 }
@@ -147,14 +146,21 @@
 
 void benchmark::out()
 {
-    ostr << str() << std::endl;
+    std::cout << str() << std::endl;
 }
 
-std::string benchmark::str(const benchVals &bv)
+const char *benchmark::str(const benchVals &bv)
 {
     std::stringstream ss;
-    ss << descr << " Physical memory: " << bv.physMemKB << "kb; Virtual 
memory: " << bv.virtMemKB;
+    ss << " Physical memory: " << bv.physMemKB << "kb; Virtual memory: " << 
bv.virtMemKB;
     ss << "kb; User CPU time: " << bv.userMilliseconds << "ms; System CPU 
time: " << bv.sysMilliseconds << "ms";
-    return ss.str();
+    if(benchVals_str) {
+        free((void *)benchVals_str);
+        benchVals_str = NULL;
+    }
+    benchVals_str = (char *)calloc(ss.str().length() + 1, sizeof(char));
+    snprintf(benchVals_str, ss.str().length(), "%s", ss.str().c_str());
+    benchVals_str[ss.str().length()] = '\0';
+    return benchVals_str;
 }
 

Modified: brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.h 
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.h 
2020-12-15 20:24:24 UTC (rev 77971)
@@ -5,9 +5,7 @@
 #include "sc_export.h"
 
 #ifdef __cplusplus
-#include <iostream>
 #include <iosfwd>
-#include <string>
 
 #include "sc_memmgr.h"
 extern "C" {
@@ -43,34 +41,26 @@
 {
     protected:
         benchVals initialVals, laterVals;
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable: 4251 )
-#endif
-        std::ostream &ostr;
-        std::string descr;
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
         bool debug, stopped;
+        char *benchVals_str = NULL;
+
     public:
-        benchmark(std::string description = "", bool debugMessages = true, 
std::ostream &o_stream = std::cout);
+        benchmark(bool debugMessages = true);
 
         /// if 'stopped' is false, uses str(true) to print to ostream
         ~benchmark();
         void reset();
-        void reset(std::string description);
         benchVals get();
         void stop();
 
         /// converts data member 'laterVals' into a string and returns it
-        std::string str();
+        const char *str();
 
         /// outputs result of str() on ostream 'ostr'
         void out();
 
         /// converts 'bv' into a string, prefixed by data member 'descr'
-        std::string str(const benchVals &bv);
+        const char *str(const benchVals &bv);
 };
 
 

Modified: brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.cc
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.cc 
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.cc 
2020-12-15 20:24:24 UTC (rev 77971)
@@ -9,6 +9,7 @@
 * and is not subject to copyright.
 */
 
+#include <stdio.h>
 #include <sstream>
 #include <sdai.h>
 #include "sc_memmgr.h"
@@ -15,37 +16,84 @@
 
 SDAI_Binary::SDAI_Binary(const char *str, int max)
 {
-    content = std::string(str, max);
+    if(content) {
+        free((void *)content);
+    }
+
+    content = (char *)calloc(max + 1, sizeof(char));
+    snprintf(content, max, "%s", str);
 }
 
+SDAI_Binary::SDAI_Binary(const char *s)
+{
+    if(content) {
+        free((void *)content);
+    }
+
+    content = (char *)calloc(strlen(s) + 1, sizeof(char));
+    snprintf(content, strlen(s), "%s", s);
+}
+
 SDAI_Binary::SDAI_Binary(const std::string &s)
 {
-    content = std::string(s);
+    if(content) {
+        free((void *)content);
+    }
+
+    content = (char *)calloc(s.length() + 1, sizeof(char));
+    snprintf(content, s.length(), "%s", s.c_str());
 }
 
+SDAI_Binary::SDAI_Binary(int i)
+{
+    if(content) {
+        free((void *)content);
+    }
+
+    content = (char *)calloc(2, sizeof(char));
+    if(i) {
+        content[0] = '1';
+    } else {
+        content[0] = '0';
+    }
+    content[1] = '\0';
+}
+
 SDAI_Binary::~SDAI_Binary(void)
 {
+    if(content) {
+        free((void *)content);
+    }
+    content = NULL;
 }
 
 SDAI_Binary &SDAI_Binary::operator= (const char *s)
 {
-    content = std::string(s);
+    if(content) {
+        free((void *)content);
+    }
+
+    content = (char *)calloc(strlen(s) + 1, sizeof(char));
+    snprintf(content, strlen(s), "%s", s);
     return *this;
 }
 
 void SDAI_Binary::clear(void)
 {
-    content.clear();
+    if(content) {
+        free((void *)content);
+    }
+    content = NULL;
 }
 
 bool SDAI_Binary::empty(void) const
 {
-    return content.empty();
+    return (!content) ? true : false;
 }
 
 const char *SDAI_Binary::c_str(void) const
 {
-    return content.c_str();
+    return (const char *)content;
 }
 
 void SDAI_Binary::STEPwrite(ostream &out) const

Modified: brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.h  
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.h  
2020-12-15 20:24:24 UTC (rev 77971)
@@ -1,8 +1,11 @@
 #ifndef SDAIBINARY_H
 #define SDAIBINARY_H 1
 
-#include <string>
+#include "sc_export.h"
+#include "errordesc.h"
 
+#include <iostream>
+
 /*
 * NIST STEP Core Class Library
 * clstepcore/sdaiBinary.h
@@ -16,20 +19,15 @@
 class SC_DAI_EXPORT SDAI_Binary
 {
     private:
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable: 4251 )
-#endif
-        std::string content;
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
+        char *content = NULL;
 
     public:
 
         //constructor(s) & destructor
         SDAI_Binary(const char *str = 0, int max = 0);
+        SDAI_Binary(const char *s);
         SDAI_Binary(const std::string &s);
+        SDAI_Binary(int i);
         ~SDAI_Binary(void);
 
         //  operators
@@ -43,7 +41,7 @@
         {
             return c_str();
         }
-        void STEPwrite(ostream &out = cout)  const;
+        void STEPwrite(std::ostream &out = std::cout)  const;
         const char *STEPwrite(std::string &s) const;
 
         Severity StrToVal(const char *s, ErrorDescriptor *err);

Modified: 
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazy_test.cc
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazy_test.cc     
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazy_test.cc     
2020-12-15 20:24:24 UTC (rev 77971)
@@ -1,7 +1,9 @@
+#include <iostream>
+#include <string>
 #include "lazyInstMgr.h"
-#include <sc_benchmark.h>
 #include "SdaiSchemaInit.h"
 #include "sc_memmgr.h"
+#include "sc_benchmark.h"
 #include <sc_cf.h>
 
 #ifndef NO_REGISTRY
@@ -148,13 +150,15 @@
 #endif //NO_REGISTRY
 
     instanceID instWithRef;
-    benchmark stats("================ p21 lazy load: scanning the file 
================\n");
+    benchmark stats;
+    std::cout << "================ p21 lazy load: scanning the file 
================\n";
     mgr->openFile(argv[1]);
     stats.stop();
     benchVals scanStats = stats.get();
     stats.out();
 
-    stats.reset("================ p21 lazy load: gathering statistics 
================\n");
+    std::cout << "================ p21 lazy load: gathering statistics 
================\n";
+    stats.reset();
 
     int instances = mgr->totalInstanceCount();
     std::cout << "Total instances: " << instances << " (" << 
(float)(scanStats.userMilliseconds * 1000) / instances << "us per instance, ";
@@ -197,7 +201,8 @@
 #endif //NO_REGISTRY
 
     stats.out();
-    stats.reset("================ p21 lazy load: freeing memory 
================\n");
+    std::cout << "================ p21 lazy load: freeing memory 
================\n";
+    stats.reset();
     delete mgr;
     //stats will print from its destructor
 }

Modified: 
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattribute.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattribute.h  
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattribute.h  
2020-12-15 20:24:24 UTC (rev 77971)
@@ -105,10 +105,10 @@
         ErrorDescriptor _error;
         STEPattribute *_redefAttr;
     public:
-       const AttrDescriptor *aDesc;
+        const AttrDescriptor *aDesc;
 
     protected:
-       int refCount;
+        int refCount;
 
         char SkipBadAttr(istream &in, char *StopChars);
         void AddErrorInfo();

Modified: 
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiApplication_instance.cc
===================================================================
--- 
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiApplication_instance.cc
      2020-12-15 19:10:18 UTC (rev 77970)
+++ 
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiApplication_instance.cc
      2020-12-15 20:24:24 UTC (rev 77971)
@@ -703,8 +703,8 @@
         case '@':
             err->AppendToDetailMsg("Use of @ instead of # to identify 
entity.\n");
             err->GreaterSeverity(SEVERITY_WARNING);
-        // no break statement here on purpose
-           [[gnu::fallthrough]];
+            // no break statement here on purpose
+            [[gnu::fallthrough]];
         case '#': {
             int id = -1;
             in >>  id;
@@ -914,11 +914,11 @@
     if((found1 > 0) || (found2 > 0)) {
         if((found1 == 2) || (found2 == 2)) {
             int ocnt = snprintf(messageBuf, BUFSIZ,
-                    " Attribute's Entity Reference %s is %s data \'%s\'.\n",
-                    attrValue, "followed by invalid", tmp);
-           if (ocnt < BUFSIZ) {
-                   fprintf(stderr, "Warning - truncation of Attribute's Entry 
Reference msg\n");
-           }
+                                " Attribute's Entity Reference %s is %s data 
\'%s\'.\n",
+                                attrValue, "followed by invalid", tmp);
+            if(ocnt < BUFSIZ) {
+                fprintf(stderr, "Warning - truncation of Attribute's Entry 
Reference msg\n");
+            }
             err->AppendToUserMsg(messageBuf);
             err->AppendToDetailMsg(messageBuf);
             err->GreaterSeverity(SEVERITY_WARNING);

Modified: 
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_wrapper.cc  
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_wrapper.cc  
2020-12-15 20:24:24 UTC (rev 77971)
@@ -424,18 +424,18 @@
     sprintf(schnm, "%s%s", SCHEMA_FILE_PREFIX, 
StrToUpper(SCHEMAget_name(schema)));       //TODO change file names to 
CamelCase?
     if(suffix == 0) {
         ocnt = snprintf(sufnm, MAX_LEN, "%s", schnm);
-       if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper.cc line 425 - sufnm not 
large enough to hold schnm\n";
-       }
+        if(ocnt > MAX_LEN) {
+            std::cerr << "Warning - classes_wrapper.cc line 425 - sufnm not 
large enough to hold schnm\n";
+        }
     } else {
         ocnt = snprintf(sufnm, MAX_LEN, "%s_%d", schnm, suffix);
-       if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper.cc line 430 - sufnm not 
large enough to hold string\n";
-       }
+        if(ocnt > MAX_LEN) {
+            std::cerr << "Warning - classes_wrapper.cc line 430 - sufnm not 
large enough to hold string\n";
+        }
     }
     ocnt = snprintf(fnm, MAX_LEN, "%s.h", sufnm);
-    if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper.cc line 436 - sufnm not 
large enough to hold string\n";
+    if(ocnt > MAX_LEN) {
+        std::cerr << "Warning - classes_wrapper.cc line 436 - sufnm not large 
enough to hold string\n";
     }
 
     if(!(incfile = (files -> inc) = FILEcreate(fnm))) {
@@ -478,8 +478,8 @@
 
     // 3. header for namespace to contain all formerly-global variables
     ocnt = snprintf(fnm, MAX_LEN, "%sNames.h", schnm);
-    if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper.cc line 480 - fnm not large 
enough to hold schnm\n";
+    if(ocnt > MAX_LEN) {
+        std::cerr << "Warning - classes_wrapper.cc line 480 - fnm not large 
enough to hold schnm\n";
     }
 
     if(!(files->names = FILEcreate(fnm))) {
@@ -497,9 +497,9 @@
     if(suffix <= 1) {
         /* I.e., if this is our first pass with schema */
         ocnt = snprintf(fnm, MAX_LEN, "%s.init.cc", schnm);
-       if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper.cc line 499 - fnm not large 
enough to hold string\n";
-       }
+        if(ocnt > MAX_LEN) {
+            std::cerr << "Warning - classes_wrapper.cc line 499 - fnm not 
large enough to hold string\n";
+        }
 
         /* Note - We use schnm (without the "_x" suffix sufnm has) since we
         ** only generate a single init.cc file. */
@@ -563,12 +563,12 @@
         fprintf(files->classes, "\n#include \"%sNames.h\"\n", schnm);
     } else {
         /* Just reopen the .init.cc (in append mode): */
-       ocnt = snprintf(fnm, MAX_LEN, "%s.init.cc", schnm);
-       if (ocnt > MAX_LEN) {
-               std::cerr << "Warning - classes_wrapper.cc line 558 - sufnm not 
large enough to hold string\n";
-       }
+        ocnt = snprintf(fnm, MAX_LEN, "%s.init.cc", schnm);
+        if(ocnt > MAX_LEN) {
+            std::cerr << "Warning - classes_wrapper.cc line 558 - sufnm not 
large enough to hold string\n";
+        }
 
-       initfile = files->init = fopen(fnm, "a");
+        initfile = files->init = fopen(fnm, "a");
     }
 
     /**********  record in files relating to entire input   ***********/

Modified: brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/selects.c
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/selects.c   
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/selects.c   
2020-12-15 20:24:24 UTC (rev 77971)
@@ -1113,9 +1113,9 @@
 
             /*   get methods  */
             TYPEselect_lib_part_three_getter(type, classnm, attrnm, utype, 
uent, funcnm, items, a, uattr, ent, f, false);
-           /* TODO - This isn't good enough - the compiler warning 
Wignored-qualifiers is picking up
-            * a lot of spurious const expressions coming from these outputs. 
Not sure of the pattern
-            * yet, but it looks like not all attrIsObj entities should be 
using it. */
+            /* TODO - This isn't good enough - the compiler warning 
Wignored-qualifiers is picking up
+             * a lot of spurious const expressions coming from these outputs. 
Not sure of the pattern
+             * yet, but it looks like not all attrIsObj entities should be 
using it. */
             if(attrIsObj(VARget_type(a))) {
                 TYPEselect_lib_part_three_getter(type, classnm, attrnm, utype, 
uent, funcnm, items, a, uattr, ent, f, true);
             }

Modified: 
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_wrapper_python.cc
===================================================================
--- 
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_wrapper_python.cc
    2020-12-15 19:10:18 UTC (rev 77970)
+++ 
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_wrapper_python.cc
    2020-12-15 20:24:24 UTC (rev 77971)
@@ -165,13 +165,13 @@
         sprintf(sufnm, "%s", schnm);
     } else {
         ocnt = snprintf(sufnm, MAX_LEN, "%s_%d", schnm, suffix);
-       if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper_python.cc - sufnm not large 
enough to hold string\n";
-       }
+        if(ocnt > MAX_LEN) {
+            std::cerr << "Warning - classes_wrapper_python.cc - sufnm not 
large enough to hold string\n";
+        }
     }
     ocnt = snprintf(fnm, MAX_LEN, "%s.h", sufnm);
-    if (ocnt > MAX_LEN) {
-           std::cerr << "Warning - classes_wrapper_python.cc - fnm not large 
enough to hold string\n";
+    if(ocnt > MAX_LEN) {
+        std::cerr << "Warning - classes_wrapper_python.cc - fnm not large 
enough to hold string\n";
     }
 
     np = fnm + strlen(fnm) - 1;   /*  point to end of constant part of string  
*/

Modified: brlcad/branches/stepsync/src/other/stepcode/src/express/expr.c
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/express/expr.c      
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/express/expr.c      
2020-12-15 20:24:24 UTC (rev 77971)
@@ -239,8 +239,8 @@
                 *dt = DICT_type;
                 return 1;
             } else {
-               return 0;
-           }
+                return 0;
+            }
         default:
             return 0;
     }
@@ -327,8 +327,8 @@
                     } else {
                         fprintf(stderr, "EXPresolved_op_dot: attribute not an 
attribute?\n");
                         ERRORabort(0);
-                       return(Type_Bad);
-                   }
+                        return(Type_Bad);
+                    }
                 default:
                     /* compile-time ambiguous */
                     if(where) {
@@ -615,13 +615,13 @@
 {
     int failed = 0;
 
-    if (OPget_number_of_operands(e->e.op_code) == 3) {
-            EXPresolve(e->e.op3, s, Type_Dont_Care);
-            failed = is_resolve_failed(e->e.op3);
+    if(OPget_number_of_operands(e->e.op_code) == 3) {
+        EXPresolve(e->e.op3, s, Type_Dont_Care);
+        failed = is_resolve_failed(e->e.op3);
     }
-    if (OPget_number_of_operands(e->e.op_code) == 2) {
-            EXPresolve(e->e.op2, s, Type_Dont_Care);
-            failed |= is_resolve_failed(e->e.op2);
+    if(OPget_number_of_operands(e->e.op_code) == 2) {
+        EXPresolve(e->e.op2, s, Type_Dont_Care);
+        failed |= is_resolve_failed(e->e.op2);
     }
     EXPresolve(e->e.op1, s, Type_Dont_Care);
     if(failed || is_resolve_failed(e->e.op1)) {

Modified: 
brlcad/branches/stepsync/src/other/stepcode/src/test/p21read/p21read.cc
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/test/p21read/p21read.cc     
2020-12-15 19:10:18 UTC (rev 77970)
+++ brlcad/branches/stepsync/src/other/stepcode/src/test/p21read/p21read.cc     
2020-12-15 20:24:24 UTC (rev 77971)
@@ -13,7 +13,6 @@
 */
 
 extern void SchemaInit(class Registry &);
-#include "sc_version_string.h"
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>
@@ -94,7 +93,7 @@
 
 void printVersion(const char *exe)
 {
-    std::cout << exe << " build info: " << sc_version << std::endl;
+    std::cout << exe << " build info: " << SC_VERSION << std::endl;
 }
 
 void printUse(const char *exe)
@@ -155,7 +154,8 @@
     STEPfile  sfile(registry, instance_list, "", strict);
     char     *flnm;
 
-    benchmark stats("p21 ReadExchangeFile()");
+    // p21 ReadExchangeFile()
+    benchmark stats;
 
     cout << argv[0] << ": load file ..." << endl;
     if(argc >= (sc_optind + 1)) {

Modified: 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/attribute.cc
===================================================================
--- 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/attribute.cc
   2020-12-15 19:10:18 UTC (rev 77970)
+++ 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/attribute.cc
   2020-12-15 20:24:24 UTC (rev 77971)
@@ -3,7 +3,6 @@
  * Test attribute access; uses a tiny schema similar to a subset of IFC2x3
  */
 #include <sc_cf.h>
-#include "sc_version_string.h"
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>

Modified: 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr1.cc
===================================================================
--- 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr1.cc
       2020-12-15 19:10:18 UTC (rev 77970)
+++ 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr1.cc
       2020-12-15 20:24:24 UTC (rev 77971)
@@ -4,7 +4,6 @@
 **
 */
 #include <sc_cf.h>
-#include "sc_version_string.h"
 #include "SubSuperIterators.h"
 #include <STEPfile.h>
 #include <sdai.h>

Modified: 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr2.cc
===================================================================
--- 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr2.cc
       2020-12-15 19:10:18 UTC (rev 77970)
+++ 
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr2.cc
       2020-12-15 20:24:24 UTC (rev 77971)
@@ -4,7 +4,6 @@
 **
 */
 #include <sc_cf.h>
-#include "sc_version_string.h"
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to