Fixed some compiler warnings.

diff --git a/base/exception.h b/base/exception.h
index 6ee1d521b485224e7d1d4ae3eb60d995d5f2fd8c..659bf333ba5c46fb93cd072fdce4602282260232 100644 (file)
--- a/base/exception.h
+++ b/base/exception.h
@@ -64,7 +64,7 @@ public:
                    : Exception(message)                                \
                {                                                       \
                }                                                       \
-       };
+       }
 
 DEFINE_EXCEPTION_CLASS(NotImplementedException);
 DEFINE_EXCEPTION_CLASS(InvalidArgumentException);

diff --git a/base/variant.h b/base/variant.h
index 77034fd109ce603439a00be3fb037eb40496c499..34f7823cd779113163ccb7c59fc94833b65a29c7 100644 (file)
--- a/base/variant.h
+++ b/base/variant.h
@@ -34,25 +34,29 @@ enum I2_BASE_API VariantType
 class I2_BASE_API Variant
 {
 private:
+       mutable VariantType m_Type;
+
        mutable long m_IntegerValue;
        mutable string m_StringValue;
        mutable Object::Ptr m_ObjectValue;
 
-       mutable VariantType m_Type;
-
        void Convert(VariantType newType) const;
 
 public:
        inline Variant(void) : m_Type(VariantEmpty) { }
 
-       inline Variant(long value) : m_Type(VariantInteger), m_IntegerValue(value) { }
+       inline Variant(long value)
+           : m_Type(VariantInteger), m_IntegerValue(value) { }
 
-       inline Variant(const char *value) : m_Type(VariantString), m_StringValue(string(value)) { }
+       inline Variant(const char *value)
+           : m_Type(VariantString), m_StringValue(string(value)) { }
 
-       inline Variant(string value) : m_Type(VariantString), m_StringValue(value) { }
+       inline Variant(string value)
+           : m_Type(VariantString), m_StringValue(value) { }
 
        template<typename T>
-       Variant(const shared_ptr<T>& value) : m_Type(VariantObject), m_ObjectValue(value) { }
+       Variant(const shared_ptr<T>& value)
+           : m_Type(VariantObject), m_ObjectValue(value) { }
 
        VariantType GetType(void) const;