| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2016 Google Inc. | 2  * Copyright 2016 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #ifndef SKSL_UTIL | 8 #ifndef SKSL_UTIL | 
| 9 #define SKSL_UTIL | 9 #define SKSL_UTIL | 
| 10 | 10 | 
|  | 11 #include <iomanip> | 
| 11 #include <string> | 12 #include <string> | 
| 12 #include <sstream> | 13 #include <sstream> | 
| 13 #include "stdlib.h" | 14 #include "stdlib.h" | 
| 14 #include "assert.h" | 15 #include "assert.h" | 
| 15 #include "SkTypes.h" | 16 #include "SkTypes.h" | 
| 16 | 17 | 
| 17 namespace SkSL { | 18 namespace SkSL { | 
| 18 | 19 | 
| 19 // our own definitions of certain std:: functions, because they are not always p
    resent on Android | 20 // our own definitions of certain std:: functions, because they are not always p
    resent on Android | 
| 20 | 21 | 
| 21 template <typename T> std::string to_string(T value) { | 22 template <typename T> std::string to_string(T value) { | 
| 22 #ifdef SK_BUILD_FOR_ANDROID |  | 
| 23     std::stringstream buffer; | 23     std::stringstream buffer; | 
| 24     buffer << value; | 24     buffer << std::setprecision(std::numeric_limits<T>::digits10) << value; | 
| 25     return buffer.str(); | 25     return buffer.str(); | 
| 26 #else |  | 
| 27     return std::to_string(value); |  | 
| 28 #endif |  | 
| 29 } | 26 } | 
| 30 | 27 | 
| 31 #if _MSC_VER | 28 #if _MSC_VER | 
| 32 #define NORETURN __declspec(noreturn) | 29 #define NORETURN __declspec(noreturn) | 
| 33 #else | 30 #else | 
| 34 #define NORETURN __attribute__((__noreturn__)) | 31 #define NORETURN __attribute__((__noreturn__)) | 
| 35 #endif | 32 #endif | 
| 36 int stoi(std::string s); | 33 int stoi(std::string s); | 
| 37 | 34 | 
| 38 double stod(std::string s); | 35 double stod(std::string s); | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 51 #define ASSERT_RESULT(x) x | 48 #define ASSERT_RESULT(x) x | 
| 52 #endif | 49 #endif | 
| 53 | 50 | 
| 54 #ifdef SKIA | 51 #ifdef SKIA | 
| 55 #define ABORT(...) { SkDebugf(__VA_ARGS__); sksl_abort(); } | 52 #define ABORT(...) { SkDebugf(__VA_ARGS__); sksl_abort(); } | 
| 56 #else | 53 #else | 
| 57 #define ABORT(...) { sksl_abort(); } | 54 #define ABORT(...) { sksl_abort(); } | 
| 58 #endif | 55 #endif | 
| 59 | 56 | 
| 60 #endif | 57 #endif | 
| OLD | NEW | 
|---|