Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/panda/src/express/pointerToArray.I b/panda/src/express/pointerToArray.I
- index 5fb560b69..08b881efe 100644
- --- a/panda/src/express/pointerToArray.I
- +++ b/panda/src/express/pointerToArray.I
- @@ -296,8 +296,7 @@ erase(iterator first, iterator last) {
- nassertv(last >= ((To *)(this->_void_ptr))->begin() && last <= ((To *)(this->_void_ptr))->end());
- ((To *)(this->_void_ptr))->erase(first, last);
- }
- -
- -#if !defined(WIN32_VC) && !defined(WIN64_VC)
- +#if !defined(_WIN32)
- /**
- *
- */
- @@ -844,7 +843,7 @@ back() const {
- return ((To *)(this->_void_ptr))->back();
- }
- -#if !defined(WIN32_VC) && !defined(WIN64_VC)
- +#if !defined(_WIN32)
- /**
- *
- */
- diff --git a/panda/src/express/pointerToArray.h b/panda/src/express/pointerToArray.h
- index 7ff07a5ef..1ed25282f 100644
- --- a/panda/src/express/pointerToArray.h
- +++ b/panda/src/express/pointerToArray.h
- @@ -61,7 +61,7 @@
- #include "pointerToArrayBase.h"
- -#if (defined(WIN32_VC) || defined(WIN64_VC)) && !defined(__INTEL_COMPILER)
- +#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
- // disable mysterious MSVC warning for static inline PTA::empty_array method
- // need to chk if vc 7.0 still has this problem, would like to keep it enabled
- #pragma warning (disable : 4506)
- @@ -179,7 +179,7 @@ public:
- INLINE void erase(iterator position);
- INLINE void erase(iterator first, iterator last);
- -#if !defined(WIN32_VC) && !defined (WIN64_VC)
- +#if !defined(_WIN32)
- INLINE reference operator [](size_type n) const;
- INLINE reference operator [](int n) const;
- #endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement