zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Ice/ArgVector.h

@@ -1,36 +1,30 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_ARGVECTOR_H
 #define ICE_ARGVECTOR_H
 
-#include <Ice/Config.h>
-#include <vector>
+#include "Ice/Config.h"
 #include <string>
+#include <vector>
 
 namespace IceInternal
 {
-
-class ICE_API ArgVector
-{
-public:
-
-    ArgVector(int argc, const char* const argv[]);
-    ArgVector(const ::std::vector< ::std::string>&);
-    ArgVector(const ArgVector&);
-    ArgVector& operator=(const ArgVector&);
-    ~ArgVector();
-
-    int argc;
-    char** argv;
-
-private:
-
-    ::std::vector< ::std::string> _args;
-    void setupArgcArgv();
-};
-
+    class ICE_API ArgVector
+    {
+    public:
+        ArgVector(int argc, const char* const argv[]);
+        ArgVector(const std::vector<std::string>&);
+        ArgVector(const ArgVector&);
+        ArgVector& operator=(const ArgVector&);
+        ~ArgVector();
+
+        int argc;
+        char** argv;
+
+    private:
+        std::vector<std::string> _args;
+        void setupArgcArgv();
+    };
 }
 
 #endif

data/dist/ice/cpp/src/Ice/Base64.cpp

@@ -1,18 +1,18 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
-#include <Ice/Base64.h>
+#include "Base64.h"
+
+#include <cstddef>
 #include <iterator>
 
 using namespace std;
 
 string
-IceInternal::Base64::encode(const vector<unsigned char>& plainSeq)
+IceInternal::Base64::encode(const vector<byte>& plainSeq)
 {
     string retval;
 
-    if(plainSeq.size() == 0)
+    if (plainSeq.size() == 0)
     {
         return retval;
     }
@@ -24,39 +24,39 @@ IceInternal::Base64::encode(const vector<unsigned char>& plainSeq)
 
     retval.reserve(totalBytes);
 
-    unsigned char by1 = 0;
-    unsigned char by2 = 0;
-    unsigned char by3 = 0;
-    unsigned char by4 = 0;
-    unsigned char by5 = 0;
-    unsigned char by6 = 0;
-    unsigned char by7 = 0;
+    byte by1 = byte{0};
+    byte by2 = byte{0};
+    byte by3 = byte{0};
+    byte by4 = byte{0};
+    byte by5 = byte{0};
+    byte by6 = byte{0};
+    byte by7 = byte{0};
 
-    for(size_t i = 0; i < plainSeq.size(); i += 3)
+    for (size_t i = 0; i < plainSeq.size(); i += 3)
     {
         by1 = plainSeq[i];
-        by2 = 0;
-        by3 = 0;
+        by2 = byte{0};
+        by3 = byte{0};
 
-        if((i + 1) < plainSeq.size())
+        if ((i + 1) < plainSeq.size())
         {
-            by2 = plainSeq[i+1];
+            by2 = plainSeq[i + 1];
         }
 
-        if((i + 2) < plainSeq.size())
+        if ((i + 2) < plainSeq.size())
         {
-            by3 = plainSeq[i+2];
+            by3 = plainSeq[i + 2];
         }
 
         by4 = by1 >> 2;
-        by5 = static_cast<unsigned char>((by1 & 0x3) << 4) | (by2 >> 4);
-        by6 = static_cast<unsigned char>((by2 & 0xf) << 2) | (by3 >> 6);
-        by7 = by3 & 0x3f;
+        by5 = (by1 & byte{0x3}) << 4 | (by2 >> 4);
+        by6 = (by2 & byte{0xf}) << 2 | (by3 >> 6);
+        by7 = by3 & byte{0x3f};
 
         retval += encode(by4);
         retval += encode(by5);
 
-        if((i + 1) < plainSeq.size())
+        if ((i + 1) < plainSeq.size())
         {
             retval += encode(by6);
         }
@@ -65,7 +65,7 @@ IceInternal::Base64::encode(const vector<unsigned char>& plainSeq)
             retval += "=";
         }
 
-        if((i + 2) < plainSeq.size())
+        if ((i + 2) < plainSeq.size())
         {
             retval += encode(by7);
         }
@@ -79,9 +79,9 @@ IceInternal::Base64::encode(const vector<unsigned char>& plainSeq)
     outString.reserve(totalBytes);
     string::iterator iter = retval.begin();
 
-    while((retval.end() - iter) > 76)
+    while ((retval.end() - iter) > 76)
     {
-        copy(iter, iter+76, back_inserter(outString));
+        copy(iter, iter + 76, back_inserter(outString));
         outString += "\r\n";
         iter += 76;
     }
@@ -91,24 +91,24 @@ IceInternal::Base64::encode(const vector<unsigned char>& plainSeq)
     return outString;
 }
 
-vector<unsigned char>
+vector<byte>
 IceInternal::Base64::decode(const string& str)
 {
     string newStr;
 
     newStr.reserve(str.length());
 
-    for(size_t j = 0; j < str.length(); j++)
+    for (size_t j = 0; j < str.length(); j++)
     {
-        if(isBase64(str[j]))
+        if (isBase64(str[j]))
         {
             newStr += str[j];
         }
     }
 
-    vector<unsigned char> retval;
+    vector<byte> retval;
 
-    if(newStr.length() == 0)
+    if (newStr.length() == 0)
     {
         return retval;
     }
@@ -123,14 +123,14 @@ IceInternal::Base64::decode(const string& str)
 
     retval.reserve(totalBytes);
 
-    unsigned char by1 = 0;
-    unsigned char by2 = 0;
-    unsigned char by3 = 0;
-    unsigned char by4 = 0;
+    byte by1{0};
+    byte by2{0};
+    byte by3{0};
+    byte by4{0};
 
     char c1, c2, c3, c4;
 
-    for(size_t i = 0; i < newStr.length(); i += 4)
+    for (size_t i = 0; i < newStr.length(); i += 4)
     {
         c2 = 'A';
         c3 = 'A';
@@ -138,17 +138,17 @@ IceInternal::Base64::decode(const string& str)
 
         c1 = newStr[i];
 
-        if((i + 1) < newStr.length())
+        if ((i + 1) < newStr.length())
         {
             c2 = newStr[i + 1];
         }
 
-        if((i + 2) < newStr.length())
+        if ((i + 2) < newStr.length())
         {
             c3 = newStr[i + 2];
         }
 
-        if((i + 3) < newStr.length())
+        if ((i + 3) < newStr.length())
         {
             c4 = newStr[i + 3];
         }
@@ -158,16 +158,16 @@ IceInternal::Base64::decode(const string& str)
         by3 = decode(c3);
         by4 = decode(c4);
 
-        retval.push_back(static_cast<unsigned char>(by1 << 2) | (by2 >> 4));
+        retval.push_back((by1 << 2) | by2 >> 4);
 
-        if(c3 != '=')
+        if (c3 != '=')
         {
-            retval.push_back(static_cast<unsigned char>((by2 & 0xf) << 4) | (by3 >> 2));
+            retval.push_back(((by2 & byte{0xf}) << 4) | (by3 >> 2));
         }
 
-        if(c4 != '=')
+        if (c4 != '=')
         {
-            retval.push_back(static_cast<unsigned char>((by3 & 0x3) << 6) | by4);
+            retval.push_back(((by3 & byte{0x3}) << 6) | by4);
         }
     }
 
@@ -177,32 +177,32 @@ IceInternal::Base64::decode(const string& str)
 bool
 IceInternal::Base64::isBase64(char c)
 {
-    if(c >= 'A' && c <= 'Z')
+    if (c >= 'A' && c <= 'Z')
     {
         return true;
     }
 
-    if(c >= 'a' && c <= 'z')
+    if (c >= 'a' && c <= 'z')
     {
         return true;
     }
 
-    if(c >= '0' && c <= '9')
+    if (c >= '0' && c <= '9')
     {
         return true;
     }
 
-    if(c == '+')
+    if (c == '+')
     {
         return true;
     }
 
-    if(c == '/')
+    if (c == '/')
     {
         return true;
     }
 
-    if(c == '=')
+    if (c == '=')
     {
         return true;
     }
@@ -211,24 +211,24 @@ IceInternal::Base64::isBase64(char c)
 }
 
 char
-IceInternal::Base64::encode(unsigned char uc)
+IceInternal::Base64::encode(byte uc)
 {
-    if(uc < 26)
+    if (uc < byte{26})
     {
         return 'A' + static_cast<char>(uc);
     }
 
-    if(uc < 52)
+    if (uc < byte{52})
     {
         return 'a' + static_cast<char>(uc) - 26;
     }
 
-    if(uc < 62)
+    if (uc < byte{62})
     {
         return '0' + static_cast<char>(uc) - 52;
     }
 
-    if(uc == 62)
+    if (uc == byte{62})
     {
         return '+';
     }
@@ -236,28 +236,28 @@ IceInternal::Base64::encode(unsigned char uc)
     return '/';
 }
 
-unsigned char
+byte
 IceInternal::Base64::decode(char c)
 {
-    if(c >= 'A' && c <= 'Z')
+    if (c >= 'A' && c <= 'Z')
     {
-        return static_cast<unsigned char>(c - 'A');
+        return static_cast<byte>(c - 'A');
     }
 
-    if(c >= 'a' && c <= 'z')
+    if (c >= 'a' && c <= 'z')
     {
-        return static_cast<unsigned char>(c - 'a' + 26);
+        return static_cast<byte>(c - 'a' + 26);
     }
 
-    if(c >= '0' && c <= '9')
+    if (c >= '0' && c <= '9')
     {
-        return static_cast<unsigned char>(c - '0' + 52);
+        return static_cast<byte>(c - '0' + 52);
     }
 
-    if(c == '+')
+    if (c == '+')
     {
-        return 62;
+        return byte{62};
     }
 
-    return 63;
+    return byte{63};
 }

data/dist/ice/cpp/src/Ice/Base64.h

@@ -1,31 +1,26 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_BASE_64_H
 #define ICE_BASE_64_H
 
-#include <Ice/Config.h>
+#include "Ice/Config.h"
+
 #include <string>
 #include <vector>
 
 namespace IceInternal
 {
-
-class ICE_API Base64
-{
-public:
-
-    static std::string encode(const std::vector<unsigned char>&);
-    static std::vector<unsigned char> decode(const std::string&);
-    static bool isBase64(char);
-
-private:
-
-    static char encode(unsigned char);
-    static unsigned char decode(char);
-};
-
+    class Base64
+    {
+    public:
+        static std::string encode(const std::vector<std::byte>&);
+        static std::vector<std::byte> decode(const std::string&);
+        static bool isBase64(char);
+
+    private:
+        static char encode(std::byte);
+        static std::byte decode(char);
+    };
 }
 
 #endif