diff options
author | Mathias Stearn <mathias@10gen.com> | 2010-07-02 17:26:58 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2010-07-02 17:39:43 -0400 |
commit | 717117eecdc702e13caa1f60b34f7ea510c72964 (patch) | |
tree | edb51d0776ad08d4c18210d6e2ca326d87ce2eb8 | |
parent | 6468ece9c373c7eea59141b880399e2a81fd241a (diff) | |
download | mongo-717117eecdc702e13caa1f60b34f7ea510c72964.tar.gz |
cleaner #ifdefs
-rw-r--r-- | util/text.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/util/text.h b/util/text.h index 64e5ccc7945..dc4098713e3 100644 --- a/util/text.h +++ b/util/text.h @@ -124,8 +124,7 @@ namespace mongo { errno = 0; ret = strtoll( n, &endPtr, 10 ); uassert( 13305, "could not convert string to long long", *endPtr == 0 && errno == 0 ); -#else -#if _MSC_VER>=1600 // 1600 is VS2k10 1500 is VS2k8 +#elif _MSC_VER>=1600 // 1600 is VS2k10 1500 is VS2k8 size_t endLen = 0; try { ret = stoll( n, &endLen, 10 ); @@ -141,7 +140,6 @@ namespace mongo { endPtr = 0; } uassert( 13310, "could not convert string to long long", *endPtr == 0 ); -#endif // _MSC_VER >= 16 #endif // !defined(_WIN32) return ret; } |