Use fundamental integer types in vespalib::visit.

2 files changed, 32 insertions, 16 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/objects/visit.cpp b/staging_vespalib/src/vespa/vespalib/objects/visit.cpp
index 10df89e3ae0..2672f61fdb6 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/visit.cpp
+++ b/staging_vespalib/src/vespa/vespalib/objects/visit.cpp
@@ -19,39 +19,52 @@ void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, bool val
     self.visitBool(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int8_t value)
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, char value)
 {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint8_t value)
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, signed char value)
 {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int16_t value)
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned char value)
 {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint16_t value)
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, short value)
 {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int32_t value) {
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned short value)
+{
+    self.visitInt(name, value);
+}
+
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int value) {
+    self.visitInt(name, value);
+}
+
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned int value) {
+    self.visitInt(name, value);
+}
+
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, long value) {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint32_t value) {
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned long value) {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int64_t value) {
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, long long value) {
     self.visitInt(name, value);
 }
 
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint64_t value) {
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned long long value) {
     self.visitInt(name, value);
 }
 
diff --git a/staging_vespalib/src/vespa/vespalib/objects/visit.h b/staging_vespalib/src/vespa/vespalib/objects/visit.h
index 22c73dceefd..dec994421b4 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/visit.h
+++ b/staging_vespalib/src/vespa/vespalib/objects/visit.h
@@ -11,14 +11,17 @@ namespace vespalib {
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, const vespalib::Identifiable *obj);
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, const vespalib::Identifiable &obj);
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, bool value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int8_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint8_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int16_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint16_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int32_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint32_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int64_t value);
-void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint64_t value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, char value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, signed char value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned char value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, short value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned short value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, int value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned int value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, long value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned long value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, long long value);
+void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, unsigned long long value);
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, float value);
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, double value);
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, const vespalib::string &value);