Switch SdaiBinary content container to a plain C string to avoid the 4251 warning.

starseeker · starseeker · commit d27564c5ed8c · 2020-12-15T15:13:04.000-05:00
diff --git a/src/cldai/sdaiBinary.cc b/src/cldai/sdaiBinary.cc
@@ -9,43 +9,91 @@
 * and is not subject to copyright.
 */
 
+#include <stdio.h>
 #include <sstream>
 #include <sdai.h>
 #include "sc_memmgr.h"
 
 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
diff --git a/src/cldai/sdaiBinary.h b/src/cldai/sdaiBinary.h
@@ -1,7 +1,10 @@
 #ifndef SDAIBINARY_H
 #define SDAIBINARY_H 1
 
-#include <string>
+#include "sc_export.h"
+#include "errordesc.h"
+
+#include <iostream>
 
 /*
 * NIST STEP Core Class Library
@@ -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 @@ class SC_DAI_EXPORT SDAI_Binary
         {
             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);
