Style fixes: Changed INT64MIN and INT64MAX to Int64Min and Int64Max.

Moved the definitions of Int64, Int64Min, and Int64Max into
    IceUtil/Config.h.
Updated scanner and parser to use the new constant names. Also applied
    style fixes to parser: INT16MIN -> Int16Min, BYTEMIN -> ByteMin, etc.
Changed Time.h and Time.cpp to use the Int64 type from IceUtil/Config.h.

3 files changed, 10 insertions, 10 deletions

diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index d52916af3be..125051b71d0 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -29,28 +29,28 @@ IceUtil::Time::now()
 #ifdef WIN32
     struct _timeb tb;
     _ftime(&tb);
-    return Time(tb.time * static_cast<LongLong>(1000000) + tb.millitm * static_cast<LongLong>(1000));
+    return Time(tb.time * static_cast<Int64>(1000000) + tb.millitm * static_cast<Int64>(1000));
 #else
     struct timeval tv;
     gettimeofday(&tv, 0);
-    return Time(tv.tv_sec * static_cast<LongLong>(1000000) + tv.tv_usec);
+    return Time(tv.tv_sec * static_cast<Int64>(1000000) + tv.tv_usec);
 #endif
 }
 
 Time
 IceUtil::Time::seconds(long t)
 {
-    return Time(t * static_cast<LongLong>(1000000));
+    return Time(t * static_cast<Int64>(1000000));
 }
 
 Time
 IceUtil::Time::milliSeconds(long t)
 {
-    return Time(t * static_cast<LongLong>(1000));
+    return Time(t * static_cast<Int64>(1000));
 }
 
 Time
-IceUtil::Time::microSeconds(LongLong t)
+IceUtil::Time::microSeconds(Int64 t)
 {
     return Time(t);
 }
@@ -136,7 +136,7 @@ IceUtil::Time::operator double() const
     return _usec / 1000000.0L;
 }
 
-Time::Time(LongLong usec) :
+Time::Time(Int64 usec) :
     _usec(usec)
 {
 }
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 206a2c0b486..ed00a9e2b48 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1595,7 +1595,7 @@ Slice::Container::checkRange(const string& name, const TypePtr& constType, const
 	case Builtin::KindByte:
 	{
 	    IceUtil::Int64 l = IceUtil::strToInt64(value.c_str(), 0, 0);
-	    if(l < BYTEMIN || l > BYTEMAX)
+	    if(l < ByteMin || l > ByteMax)
 	    {
 		string msg = "initializer `" + value + "' for constant `" + name + "' out of range for type byte";
 		_unit->error(msg);
@@ -1606,7 +1606,7 @@ Slice::Container::checkRange(const string& name, const TypePtr& constType, const
 	case Builtin::KindShort:
 	{
 	    IceUtil::Int64 l = IceUtil::strToInt64(value.c_str(), 0, 0);
-	    if(l < INT16MIN || l > INT16MAX)
+	    if(l < Int16Min || l > Int16Max)
 	    {
 		string msg = "initializer `" + value + "' for constant `" + name + "' out of range for type short";
 		_unit->error(msg);
@@ -1617,7 +1617,7 @@ Slice::Container::checkRange(const string& name, const TypePtr& constType, const
 	case Builtin::KindInt:
 	{
 	    IceUtil::Int64 l = IceUtil::strToInt64(value.c_str(), 0, 0);
-	    if(l < INT32MIN || l > INT32MAX)
+	    if(l < Int32Min || l > Int32Max)
 	    {
 		string msg = "initializer `" + value + "' for constant `" + name + "' out of range for type int";
 		_unit->error(msg);
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index c92ea37b5ec..4a5cb2cfdcb 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -303,7 +303,7 @@ floating_literal	(({fractional_constant}{exponent_part}?)|([[:digit:]]+{exponent
     *yylvalp = itp;
     errno = 0;
     itp->v = IceUtil::strToInt64(yytext, 0, 0);
-    if(errno == ERANGE && (itp->v == IceUtil::INT64MIN || itp->v == IceUtil::INT64MAX))
+    if(errno == ERANGE && (itp->v == IceUtil::Int64Min || itp->v == IceUtil::Int64Max))
     {
 	string msg = "integer constant `";
 	msg += yytext;