diff options
| author | Chad Austin <chad@imvu.com> | 2013-02-04 22:49:29 -0800 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:23:56 +0300 |
| commit | 771ee9e921504e77fe1750173e38c35857a3f016 (patch) | |
| tree | 92a75ba6e09c978ba6c43ff7601c3407a6d0b070 /system/lib | |
| parent | aef932e3a9278087e96b15c1d02e10e28ce58f47 (diff) | |
Fix a bunch of compiler warnings
Diffstat (limited to 'system/lib')
| -rwxr-xr-x | system/lib/embind/bind.cpp | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp index 5e82bb7e..39ee02be 100755 --- a/system/lib/embind/bind.cpp +++ b/system/lib/embind/bind.cpp @@ -93,50 +93,59 @@ namespace emscripten { }
}
- extern "C" {
- // These three routines constitute an extension to the compiler's support for dynamic type conversion.
- // They are used by embind.js to implement automatic downcasting of return values which are pointers to
- // polymorphic objects.
-
- // __getDerivationPath returns an array of type_info pointers describing the derivation chain starting with
- // the derived type and proceeding toward (and ending with) the base type. Types are only included if they
- // appear on all possible derivation paths.
- std::vector<int> __getDerivationPath(int dv, const int bs) {
- std::vector<std::vector<const __cxxabiv1::__class_type_info*>> paths;
-
- const std::type_info* dv1 = (std::type_info*)dv;
- const std::type_info* bs1 = (std::type_info*)bs;
- const __cxxabiv1::__class_type_info* dv2 = dynamic_cast<const __cxxabiv1::__class_type_info*>(dv1);
- const __cxxabiv1::__class_type_info* bs2 = dynamic_cast<const __cxxabiv1::__class_type_info*>(bs1);
-
- if (dv2 && bs2) {
- __cxxabiv1::__getDerivationPaths(dv2, bs2, std::vector<const __cxxabiv1::__class_type_info*>(), paths);
- }
+ // __getDerivationPath returns an array of type_info pointers describing the derivation chain starting with
+ // the derived type and proceeding toward (and ending with) the base type. Types are only included if they
+ // appear on all possible derivation paths.
+ std::vector<int> __getDerivationPath(int dv, const int bs) {
+ std::vector<std::vector<const __cxxabiv1::__class_type_info*>> paths;
+
+ const std::type_info* dv1 = (std::type_info*)dv;
+ const std::type_info* bs1 = (std::type_info*)bs;
+ const __cxxabiv1::__class_type_info* dv2 = dynamic_cast<const __cxxabiv1::__class_type_info*>(dv1);
+ const __cxxabiv1::__class_type_info* bs2 = dynamic_cast<const __cxxabiv1::__class_type_info*>(bs1);
+
+ if (dv2 && bs2) {
+ __cxxabiv1::__getDerivationPaths(dv2, bs2, std::vector<const __cxxabiv1::__class_type_info*>(), paths);
+ }
- std::vector<int> derivationPath;
- if (paths.size() > 0) {
- for (int j = 0; j < paths[0].size(); j++) {
- bool disqualified = false;
- for (int i = 1; i < paths.size(); i++) {
- bool found = false;
- for (int j2 = 0; j2 < paths[i].size(); j2++) {
- if (paths[i][j2] == paths[0][j]) {
- found = true;
- break;
- }
- }
- if (!found) {
- disqualified = true;
+ std::vector<int> derivationPath;
+ if (paths.size() > 0) {
+ for (int j = 0; j < paths[0].size(); j++) {
+ bool disqualified = false;
+ for (int i = 1; i < paths.size(); i++) {
+ bool found = false;
+ for (int j2 = 0; j2 < paths[i].size(); j2++) {
+ if (paths[i][j2] == paths[0][j]) {
+ found = true;
break;
}
}
- if (!disqualified) {
- derivationPath.emplace_back((int)paths[0][j]);
+ if (!found) {
+ disqualified = true;
+ break;
}
}
+ if (!disqualified) {
+ derivationPath.emplace_back((int)paths[0][j]);
+ }
}
- return derivationPath;
}
+ return derivationPath;
+ }
+
+ std::vector<int> __getBaseClasses(int tp) {
+ std::vector<const __cxxabiv1::__class_type_info*> baseTypes = __internalGetBaseClasses((const __cxxabiv1::__class_type_info*)tp);
+ std::vector<int> bases;
+ for (int j = 0; j < baseTypes.size(); j++) {
+ bases.emplace_back((int)baseTypes[j]);
+ }
+ return bases;
+ }
+
+ extern "C" {
+ // These three routines constitute an extension to the compiler's support for dynamic type conversion.
+ // They are used by embind.js to implement automatic downcasting of return values which are pointers to
+ // polymorphic objects.
void* EMSCRIPTEN_KEEPALIVE __staticPointerCast(void* p, int from, int to) {
std::vector<std::vector<const __cxxabiv1::__class_type_info*>> paths;
@@ -212,15 +221,6 @@ namespace emscripten { return name;
}
- std::vector<int> __getBaseClasses(int tp) {
- std::vector<const __cxxabiv1::__class_type_info*> baseTypes = __internalGetBaseClasses((const __cxxabiv1::__class_type_info*)tp);
- std::vector<int> bases;
- for (int j = 0; j < baseTypes.size(); j++) {
- bases.emplace_back((int)baseTypes[j]);
- }
- return bases;
- }
-
int EMSCRIPTEN_KEEPALIVE __peek32(int p) {
return *(int *)p;
}
|