dmuratshin 9 years ago
parent
commit
f37cda6c4e
2 changed files with 10 additions and 8 deletions
  1. 8 8
      oxygine/src/json/jsoncpp.cpp
  2. 2 0
      oxygine/src/oxygine_include.h

+ 8 - 8
oxygine/src/json/jsoncpp.cpp

@@ -3103,7 +3103,7 @@ namespace Json
             default:
             default:
                 JSON_FAIL_MESSAGE("Type is not convertible to string");
                 JSON_FAIL_MESSAGE("Type is not convertible to string");
         }
         }
-		return "";
+        return "";
     }
     }
 
 
 #ifdef JSON_USE_CPPTL
 #ifdef JSON_USE_CPPTL
@@ -3139,7 +3139,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to Int.");
         JSON_FAIL_MESSAGE("Value is not convertible to Int.");
-		return 0;
+        return 0;
     }
     }
 
 
     Value::UInt Value::asUInt() const
     Value::UInt Value::asUInt() const
@@ -3164,7 +3164,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to UInt.");
         JSON_FAIL_MESSAGE("Value is not convertible to UInt.");
-		return 0;
+        return 0;
     }
     }
 
 
 #if defined(JSON_HAS_INT64)
 #if defined(JSON_HAS_INT64)
@@ -3190,7 +3190,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to Int64.");
         JSON_FAIL_MESSAGE("Value is not convertible to Int64.");
-		return 0;
+        return 0;
     }
     }
 
 
     Value::UInt64 Value::asUInt64() const
     Value::UInt64 Value::asUInt64() const
@@ -3214,7 +3214,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to UInt64.");
         JSON_FAIL_MESSAGE("Value is not convertible to UInt64.");
-		return 0;
+        return 0;
     }
     }
 #endif // if defined(JSON_HAS_INT64)
 #endif // if defined(JSON_HAS_INT64)
 
 
@@ -3258,7 +3258,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to double.");
         JSON_FAIL_MESSAGE("Value is not convertible to double.");
-		return 0.0;
+        return 0.0;
     }
     }
 
 
     float Value::asFloat() const
     float Value::asFloat() const
@@ -3283,7 +3283,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to float.");
         JSON_FAIL_MESSAGE("Value is not convertible to float.");
-		return 0.0f;
+        return 0.0f;
     }
     }
 
 
     bool Value::asBool() const
     bool Value::asBool() const
@@ -3305,7 +3305,7 @@ namespace Json
                 break;
                 break;
         }
         }
         JSON_FAIL_MESSAGE("Value is not convertible to bool.");
         JSON_FAIL_MESSAGE("Value is not convertible to bool.");
-		return false;
+        return false;
     }
     }
 
 
     bool Value::isConvertibleTo(ValueType other) const
     bool Value::isConvertibleTo(ValueType other) const

+ 2 - 0
oxygine/src/oxygine_include.h

@@ -92,6 +92,8 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 
 
 #define OXYGINE_RENDERER 4
 #define OXYGINE_RENDERER 4
 
 
+#define OXYGINE_VERSION 2
+
 #ifdef __GNUC__
 #ifdef __GNUC__
 #   define OXYGINE_DEPRECATED __attribute__((deprecated))
 #   define OXYGINE_DEPRECATED __attribute__((deprecated))
 #elif defined(_MSC_VER)
 #elif defined(_MSC_VER)