Regen SMUX support library with more recent ASN1 compiler.

[stg.git] / projects / stargazer / plugins / other / smux / types.h

diff --git a/projects/stargazer/plugins/other/smux/types.h b/projects/stargazer/plugins/other/smux/types.h
index 7d7adac2f6e70e5ebed0be7019b2d13c5244feae..e7fcbeefcf917862c399c453277aac99b44d3c02 100644 (file)
--- a/projects/stargazer/plugins/other/smux/types.h
+++ b/projects/stargazer/plugins/other/smux/types.h
@@ -1,24 +1,39 @@
-#ifndef __TYPES_H__
-#define __TYPES_H__
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#include "stg/OBJECT_IDENTIFIER.h"
+#pragma GCC diagnostic pop
 
 #include <string>
 #include <vector>
-#include <istream>
-
-#include "asn1/OBJECT_IDENTIFIER.h"
+#include <iostream>
 
-class OID {
+class OID
+{
     public:
-        OID(const std::string & str);
+        explicit OID(const std::string & str);
         OID(const char * str, size_t length);
-        OID(const std::vector<unsigned> & arcs);
-        OID(const unsigned * arcs, size_t length);
-        OID(OBJECT_IDENTIFIER_t * oid);
+        explicit OID(const std::vector<uint32_t> & arcs);
+        OID(const uint32_t * arcs, size_t length);
+        explicit OID(OBJECT_IDENTIFIER_t * oid);
         OID(const OID & rvalue);
         ~OID();
 
+        bool addSuffix(const char * suffix, size_t length);
+        bool addSuffix(const std::string & suffix);
+        bool addSuffix(const uint32_t * suffix, size_t length);
+        bool addSuffix(const std::vector<uint32_t> & suffix);
+        bool addSuffix(uint32_t a, uint32_t b);
+
+        OID copyWithSuffix(const char * suffix, size_t length) const;
+        OID copyWithSuffix(const std::string & suffix) const;
+        OID copyWithSuffix(const uint32_t * suffix, size_t length) const;
+        OID copyWithSuffix(const std::vector<uint32_t> & suffix) const;
+        OID copyWithSuffix(uint32_t a, uint32_t b) const;
+
         std::string ToString() const;
-        const std::vector<unsigned> & ToVector() const { return arcs; }
+        const std::vector<uint32_t> & ToVector() const { return arcs; }
         void ToOID(OBJECT_IDENTIFIER_t * oid) const;
 
         OID & operator=(const OID & rvalue);
@@ -28,10 +43,16 @@ class OID {
         bool operator>(const OID & rvalue) const
         { return !operator==(rvalue) && !operator<(rvalue); }
 
+        bool PrefixLess(const OID & rvalue) const;
+
         friend std::ostream & operator<<(std::ostream & stream, const OID & oid);
 
     private:
-        std::vector<unsigned> arcs;
+        std::vector<uint32_t> arcs;
 };
 
-#endif
+inline
+bool PrefixLess(const OID & a, const OID & b)
+{
+return a.PrefixLess(b);
+}