diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-08-08 16:37:13 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-08-08 16:37:13 +0000 |
| commit | 914c0791dffe34b5542f753d495435b64986c6b7 (patch) | |
| tree | d438f0e243fd61c3b78b82bf1dd51670517534e7 /cpp/src | |
| parent | Adding payload to TAO latency (only for one test type) (diff) | |
| download | ice-914c0791dffe34b5542f753d495435b64986c6b7.tar.bz2 ice-914c0791dffe34b5542f753d495435b64986c6b7.tar.xz ice-914c0791dffe34b5542f753d495435b64986c6b7.zip | |
Fixed VC6 compile errors
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 8 | ||||
| -rwxr-xr-x | cpp/src/slice2vb/Gen.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 61f4ca0c446..12a6642fee5 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -12,7 +12,7 @@ #include <Gen.h> #include <limits> #include <sys/stat.h> -#ifndef _MSC_VER +#ifndef _WIN32 #include <unistd.h> #else #include <direct.h> @@ -4890,7 +4890,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p) { _out << "override "; } - _out << (hasAMD ? "void" : retS) << ' ' << opName << spar << params; + _out << (hasAMD ? string("void") : retS) << ' ' << opName << spar << params; if(!p->isLocal()) { _out << "Ice.Current current__"; @@ -4965,7 +4965,7 @@ Slice::Gen::TieVisitor::writeInheritedOperationsWithOpNames(const ClassDefPtr& p { _out << "override "; } - _out << (hasAMD ? "void" : retS) << ' ' << opName << spar << params; + _out << (hasAMD ? string("void") : retS) << ' ' << opName << spar << params; if(!p->isLocal()) { _out << "Ice.Current current__"; @@ -5152,7 +5152,7 @@ Slice::Gen::BaseImplVisitor::writeValue(const TypePtr& type) StructPtr st = StructPtr::dynamicCast(type); if(st) { - return st->hasMetaData("clr:class") ? "null" : "new " + fixId(st->scoped()) + "()"; + return st->hasMetaData("clr:class") ? string("null") : "new " + fixId(st->scoped()) + "()"; } return "null"; diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp index a774b3b118f..ed0a1a92632 100755 --- a/cpp/src/slice2vb/Gen.cpp +++ b/cpp/src/slice2vb/Gen.cpp @@ -12,7 +12,7 @@ #include <Gen.h> #include <limits> #include <sys/stat.h> -#ifndef _MSC_VER +#ifndef _WIN32 #include <unistd.h> #else #include <direct.h> @@ -5695,7 +5695,7 @@ Slice::Gen::BaseImplVisitor::writeValue(const TypePtr& type) StructPtr st = StructPtr::dynamicCast(type); if(st) { - return st->hasMetaData("clr:class") ? "Nothing" : "New " + fixId(st->scoped()) + "()"; + return st->hasMetaData("clr:class") ? string("Nothing") : "New " + fixId(st->scoped()) + "()"; } return "Nothing"; |