Skip to content

Commit

Permalink
Merge pull request #2611 from erikaharrison-adsk/adsk/bugfix/notice_s…
Browse files Browse the repository at this point in the history
…orterror

Autodesk: Fix C3861 error for std::sort in base/tf

(Internal change: 2293966)
  • Loading branch information
pixar-oss committed Sep 7, 2023
2 parents 4dbd05b + d70e4a6 commit 8191711
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pxr/base/tf/testenv/notice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "pxr/base/tf/weakPtr.h"
#include "pxr/base/arch/systemInfo.h"

#include <algorithm>
#include <chrono>
#include <cstdio>
#include <iostream>
Expand Down Expand Up @@ -109,10 +110,11 @@ vector<string> mainThreadList;
std::mutex workerThreadLock;
std::mutex mainThreadLock;

// Helper to lock and print the list of log strings alphabetically; then clear the list
static void
_DumpLog(ostream *log, vector<string> *li, std::mutex *mutex) {
std::lock_guard<std::mutex> lock(*mutex);
sort(li->begin(), li->end());
std::sort(li->begin(), li->end());
for(vector<string>::const_iterator n = li->begin();
n != li->end(); ++ n) {
*log << *n << endl;
Expand Down

0 comments on commit 8191711

Please sign in to comment.